[Emacs-diffs] /srv/bzr/emacs/trunk r112073: Emacs crashes with ImageMagick 6.8.2-3 through 6.8.3-9.

[Paul Eggert]

------------------------------------------------------------
revno: 112073
fixes bug: http://debbugs.gnu.org/13867
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2013-03-17 22:26:56 -0700
message:
  Emacs crashes with ImageMagick 6.8.2-3 through 6.8.3-9.
  
  * configure.ac (IMAGEMAGICK_MODULE): Reject 6.8.2.
  We want to reject 6.8.2-3 through 6.8.3-9, but there seems to be
  no way to do this in pkg-config, so make do with a reasonable
  approximation.
  * etc/PROBLEMS: Mention problem with ImageMagick 6.8.2-3 through 6.8.3-9.
modified:
  ChangeLog
  configure.ac
  etc/ChangeLog
  etc/PROBLEMS

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-03-18 04:30:20 +0000
+++ b/ChangeLog 2013-03-18 05:26:56 +0000
@@ -1,5 +1,11 @@
 2013-03-18  Paul Eggert  <address@hidden>
 
+       Emacs crashes with ImageMagick 6.8.2-3 through 6.8.3-9 (Bug#13867).
+       * configure.ac (IMAGEMAGICK_MODULE): Reject 6.8.2.
+       We want to reject 6.8.2-3 through 6.8.3-9, but there seems to be
+       no way to do this in pkg-config, so make do with a reasonable
+       approximation.
+
        Automate the build of ja-dic.el (Bug#13984).
        * .bzrignore: Add leim/ja-dic/.
 

=== modified file 'configure.ac'
--- a/configure.ac      2013-03-13 18:42:22 +0000
+++ b/configure.ac      2013-03-18 05:26:56 +0000
@@ -1880,7 +1880,8 @@
     ## 6.2.8 is the earliest version known to work, but earlier versions
     ## might work - let us know if you find one.
     ## 6.0.7 does not work.  See bug#7955.
-    IMAGEMAGICK_MODULE="Wand >= 6.2.8"
+    ## 6.8.2 makes Emacs crash; see Bug#13867.
+    IMAGEMAGICK_MODULE="Wand >= 6.2.8 Wand != 6.8.2"
     PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, 
:)
     AC_SUBST(IMAGEMAGICK_CFLAGS)
     AC_SUBST(IMAGEMAGICK_LIBS)

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2013-03-12 16:53:31 +0000
+++ b/etc/ChangeLog     2013-03-18 05:26:56 +0000
@@ -1,3 +1,8 @@
+2013-03-18  Paul Eggert  <address@hidden>
+
+       Emacs crashes with ImageMagick 6.8.2-3 through 6.8.3-9 (Bug#13867).
+       * PROBLEMS: Mention problem with ImageMagick 6.8.2-3 through 6.8.3-9.
+
 2013-03-12  Paul Eggert  <address@hidden>
 
        Add coding tags for iso-2022-7bit files that are not already tagged.

=== modified file 'etc/PROBLEMS'
--- a/etc/PROBLEMS      2013-02-25 05:55:37 +0000
+++ b/etc/PROBLEMS      2013-03-18 05:26:56 +0000
@@ -206,6 +206,10 @@
 If your tar has this problem, install GNU tar--if you can manage to
 untar it :-).
 
+** Emacs crashes when displaying PNG images with simple (tRNS) transparency.
+This is due to a bug introduced in ImageMagick 6.8.2-3.  The bug
+should be fixed in ImageMagick 6.8.3-10.  Please see Bug#13867.
+
 ** Crashes when displaying GIF images in Emacs built with version
 libungif-4.1.0 are resolved by using version libungif-4.1.0b1.
 Configure checks for the correct version, but this problem could occur