From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 11 May 2010 01:46:22 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9498
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8949e8ebc70d389b6b7b71dae3fec4d9becee2d9;p=imagemagick

---

diff --git a/magick/magick-type.h b/magick/magick-type.h
index 23b06f023..ab8b0b25a 100644
--- a/magick/magick-type.h
+++ b/magick/magick-type.h
@@ -97,7 +97,7 @@ typedef double Quantum;
 #define QuantumFormat  "%g"
 #else
 #if !defined(_CH_)
-# error "Specified value of MAGICKCORE_QUANTUM_DEPTH is not supported"
+# error "MAGICKCORE_QUANTUM_DEPTH must be one of 8, 16, 32, or 64"
 #endif
 #endif
 #define MaxRGB  QuantumRange  /* deprecated */
diff --git a/magick/quantum.h b/magick/quantum.h
index 75b4dfa57..330e40d1b 100644
--- a/magick/quantum.h
+++ b/magick/quantum.h
@@ -137,7 +137,15 @@ static inline unsigned char ScaleQuantumToChar(const Quantum quantum)
 #elif (MAGICKCORE_QUANTUM_DEPTH == 64)
 static inline unsigned char ScaleQuantumToChar(const Quantum quantum)
 {
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((unsigned char) (quantum/72340172838076673.0+0.5));
+#else
+  if (quantum <= 0.0)
+    return(0);
+  if ((quantum/72340172838076673.0) >= 255.0)
+    return(255);
+  return((unsigned char) (quantum/72340172838076673.0+0.5));
+#endif
 }
 #endif