From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 19 Sep 2010 02:24:31 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~8876
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdae12a7db30748b12e95285778c5a949d11445e;p=imagemagick

---

diff --git a/ChangeLog b/ChangeLog
index 20c1bbd4b..60ab660e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-09-18  6.6.4-4 Cristy  <quetzlzacatenango@image...>
+  * Automatically set the quantum depth to 16 for HDRI.
+
 2010-09-16  6.6.4-2 Cristy  <quetzlzacatenango@image...>
   * IPTC profile not always wrapped properly inside an 8BIM profile.
   * TIFF tile geometry must be divisible by 16. 
diff --git a/configure b/configure
index d7e93aa8e..19ed7fb06 100755
--- a/configure
+++ b/configure
@@ -20205,6 +20205,9 @@ case "${with_quantum_depth}" in
     64 ) ;;
     * ) as_fn_error 16 "\"Pixel quantum depth must have value of 8" "$LINENO" 5 ;;
 esac
+if test "$enable_hdri" = 'yes'; then
+  with_quantum_depth=16
+fi
 QUANTUM_DEPTH="$with_quantum_depth"
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 49c09ecf5..a3416bab2 100755
--- a/configure.ac
+++ b/configure.ac
@@ -667,8 +667,11 @@ case "${with_quantum_depth}" in
     16 ) ;;
     32 ) ;;
     64 ) ;;
-    * ) AC_MSG_ERROR("Pixel quantum depth must have value of 8, 16, or 32") ;;
+    * ) AC_MSG_ERROR("Pixel quantum depth must have value of 8, 16, 32, or 64") ;;
 esac
+if test "$enable_hdri" = 'yes'; then
+  with_quantum_depth=16
+fi
 QUANTUM_DEPTH="$with_quantum_depth"
 AC_DEFINE_UNQUOTED(QUANTUM_DEPTH,$QUANTUM_DEPTH,[Number of bits in a pixel Quantum (8/16/32/64)])
 AC_SUBST(QUANTUM_DEPTH)dnl
diff --git a/magick/magick-type.h b/magick/magick-type.h
index 30aa28f51..aa0222be0 100644
--- a/magick/magick-type.h
+++ b/magick/magick-type.h
@@ -27,9 +27,6 @@ extern "C" {
 #if !defined(MAGICKCORE_QUANTUM_DEPTH)
 #define MAGICKCORE_QUANTUM_DEPTH  16
 #endif
-#if defined(MAGICKCORE_HDRI_SUPPORT)
-#define MAGICKCORE_QUANTUM_DEPTH  16
-#endif
 
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__)
 #  define MagickLLConstant(c)  (MagickOffsetType) (c ## i64)