commit a45da3bf94c4b3b3e02b6e2252215dcd841d440b
author cristy <urban-warrior@git.imagemagick.org> Wed Mar 31 02:06:45 2010 +0000
committer cristy <urban-warrior@git.imagemagick.org> Wed Mar 31 02:06:45 2010 +0000
tree 92ea5efc1feac616abcc4b562f9aade83ab36104
parent 57b8547e07800932617ce2197e85bc6d6d1190d9

magick/quantum-private.h

diff --git a/magick/quantum-private.h b/magick/quantum-private.h
index 79fa180..27ba52c 100644
--- a/magick/quantum-private.h
+++ b/magick/quantum-private.h
@@ -323,11 +323,13 @@
 
 static inline Quantum ScaleMapToQuantum(const MagickRealType value)
 {
+  if (value <= 0.0)
+    return((Quantum) 0);
 #if defined(MAGICKCORE_HDRI_SUPPORT)
+  if (value >= MaxMap)
+    return((Quantum) QuantumRange);
   return((Quantum) value);
 #else
-  if (value <= 0.0)
-    return(0);
   if ((value+0.5) >= MaxMap)
     return((Quantum) QuantumRange);
   return((Quantum) (value+0.5));
@@ -349,13 +351,13 @@
 
 static inline unsigned long ScaleQuantumToMap(const Quantum quantum)
 {
+  if (quantum < 0.0)
+    return(0UL);
   if (quantum >= (Quantum) MaxMap)
     return((unsigned long) MaxMap);
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((unsigned long) quantum);
 #else
-  if (quantum < 0.0)
-    return(0UL);
   return((unsigned long) (quantum+0.5));
 #endif
 }
@@ -403,11 +405,13 @@
 
 static inline Quantum ScaleMapToQuantum(const MagickRealType value)
 {
+  if (value <= 0.0)
+    return((Quantum) 0);
 #if defined(MAGICKCORE_HDRI_SUPPORT)
+  if (value >= MaxMap)
+    return((Quantum) QuantumRange);
   return((Quantum) value);
 #else
-  if (value <= 0.0)
-    return(0);
   if ((value+0.5) >= MaxMap)
     return((Quantum) QuantumRange);
   return((Quantum) (value+0.5));
@@ -429,13 +433,13 @@
 
 static inline unsigned long ScaleQuantumToMap(const Quantum quantum)
 {
+  if (quantum < 0.0)
+    return(0UL);
   if (quantum >= (Quantum) MaxMap)
     return((unsigned long) MaxMap);
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((unsigned long) quantum);
 #else
-  if (quantum < 0.0)
-    return(0UL);
   return((unsigned long) (quantum+0.5));
 #endif
 }
@@ -474,11 +478,13 @@
 
 static inline Quantum ScaleMapToQuantum(const MagickRealType value)
 {
+  if (value <= 0.0)
+    return((Quantum) 0);
 #if defined(MAGICKCORE_HDRI_SUPPORT)
+  if (value >= MaxMap)
+    return(QuantumRange);
   return((Quantum) (65537.0*value));
 #else
-  if (value <= 0.0)
-    return(0);
   if ((value+0.5) >= MaxMap)
     return(QuantumRange);
   return((Quantum) (65537UL*value));
@@ -492,14 +498,14 @@
 
 static inline unsigned long ScaleQuantumToMap(const Quantum quantum)
 {
+  if (quantum < 0.0)
+    return(0UL);
   if ((quantum/65537) >= MaxMap)
     return((unsigned long) MaxMap);
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((unsigned long) ((quantum+MagickULLConstant(32768))/
     MagickULLConstant(65537)));
 #else
-  if (quantum < 0.0)
-    return(0UL);
   return((unsigned long) (quantum/65537.0)+0.5);
 #endif
 }
@@ -547,11 +553,13 @@
 
 static inline Quantum ScaleMapToQuantum(const MagickRealType value)
 {
+  if (value <= 0.0)
+    return((Quantum) 0);
 #if defined(MAGICKCORE_HDRI_SUPPORT)
+  if (value >= MaxMap)
+    return(QuantumRange);
   return((Quantum) (281479271612415.0*value));
 #else
-  if (value <= 0.0)
-    return(0);
   if ((value+0.5) >= MaxMap)
     return(QuantumRange);
   return((Quantum) (MagickULLConstant(281479271612415)*value));
@@ -569,13 +577,13 @@
 
 static inline unsigned long ScaleQuantumToMap(const Quantum quantum)
 {
+  if (quantum < 0.0)
+    return(0UL);
   if ((quantum/281479271612415.0) >= MaxMap)
     return((unsigned long) MaxMap);
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((unsigned long) ((quantum+2147450879.0)/281479271612415.0));
 #else
-  if (quantum < 0.0)
-    return(0UL);
   return((unsigned long) (quantum/281479271612415.0)+0.5);
 #endif
 }