(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 20c1bbd4bdc3eb3e91547b64f3c1f175987573f3..60ab660e1d8bfe666aebd9eb778d82d890b5e2af 100644 (file)
--- 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 d7e93aa8e5dfff6119b4069036900e33d5fd9fa1..19ed7fb060e7c4ddb5371140264fa4bec4e29915 100755 (executable)
--- 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 49c09ecf5ad784baefd89b73c7ffdd06ca358306..a3416bab22067547784be88caabdb9293ad621c6 100755 (executable)
--- 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 30aa28f51a55fb8bd3099724270d8453d1e6a1f8..aa0222be00b18722bc4a9341f6f925e8b065136b 100644 (file)
--- 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)