2 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index eb0d744f50f..36673a3d079 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-10  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * image.c (PixelGetMagickColor): Declare if ImageMagick headers don't.
+
         Make identifiers static if they are not used in other modules.
         * data.c (Qcompiled_function, Qframe, Qvector):
         * image.c (QimageMagick, Qsvg):
diff --git a/src/image.c b/src/image.c
index 8169a9098d8..f36e097b58c 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7456,6 +7456,14 @@ imagemagick_image_p (Lisp_Object object)
 #define DrawRectangle DrawRectangleGif
 #include <wand/MagickWand.h>
 
+/* ImageMagick 6.5.3 through 6.6.5 hid PixelGetMagickColor for some reason.
+   Emacs seems to work fine with the hidden version, so unhide it.  */
+#include <magick/version.h>
+#if 0x653 <= MagickLibVersion && MagickLibVersion <= 0x665
+extern WandExport void PixelGetMagickColor (const PixelWand *,
+                                            MagickPixelPacket *);
+#endif
+
 /* Helper function for imagemagick_load, which does the actual loading
    given contents and size, apart from frame and image structures,
    passed from imagemagick_load.  Uses librimagemagick to do most of