From 651557367bbe9a8a030c6aa8b5ae01e280cec6ed Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Thu, 21 Feb 2008 17:43:19 +0000
Subject: [PATCH] look for MAGICKCORE_HDRI_SUPPORT

---
 ChangeLog                          |  1 +
 libsrc/conversion/im_magick2vips.c | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 93a9caea..9d0010c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 - you can now shrink jpegs during read, see "man im_jpeg2vips"
 - added CMYK JPEG write
 - optionally use GraphicsMagick (thanks Bob Friesenhahn)
+- look for MAGICKCORE_HDRI_SUPPORT (thanks Marcel)
 
 12/12/07 started 7.13.3
 - added "include <cstring>" to VImage.cc to help gcc 4.3
diff --git a/libsrc/conversion/im_magick2vips.c b/libsrc/conversion/im_magick2vips.c
index c4c37ff8..bdd6054e 100644
--- a/libsrc/conversion/im_magick2vips.c
+++ b/libsrc/conversion/im_magick2vips.c
@@ -18,6 +18,7 @@
  * 	- support 32/64 bit imagemagick too
  * 21/2/08 Bob Friesenhahn
  * 	- use MaxRGB if QuantumRange is missing
+ * 	- look for MAGICKCORE_HDRI_SUPPORT (thanks Marcel)
  */
 
 /*
@@ -87,15 +88,21 @@ im_magick2vips_header( const char *filename, IMAGE *im )
 
 #include <magick/api.h>
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif /*WITH_DMALLOC*/
+
 /* pre-float Magick used to call this MaxRGB.
  */
 #if !defined(QuantumRange)
 #  define QuantumRange MaxRGB
 #endif
 
-#ifdef WITH_DMALLOC
-#include <dmalloc.h>
-#endif /*WITH_DMALLOC*/
+/* And this used to be UseHDRI.
+ */
+#if MAGICKCORE_HDRI_SUPPORT
+#  define UseHDRI=1
+#endif
 
 /* What we track during a read call.
  */