(no commit message)

diff --git a/magick/quantum-private.h b/magick/quantum-private.h
index d122681a5b07c541cba056fd94c973650270050f..1d6ccefb667b4c4264ed9ace8fd6ab55cb2ef548 100644 (file)
--- a/magick/quantum-private.h
+++ b/magick/quantum-private.h
@@ -292,7 +292,7 @@ static inline Quantum ScaleAnyToQuantum(const QuantumAny quantum,
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((Quantum) (((MagickRealType) QuantumRange*quantum)/range+0.5));
 #else
-  return((Quantum) (((MagickRealType) QuantumRange*quantum)/range+0.0));
+  return((Quantum) (((MagickRealType) QuantumRange*quantum)/range+0.5));
 #endif
 }
 
@@ -302,7 +302,7 @@ static inline QuantumAny ScaleQuantumToAny(const Quantum quantum,
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((QuantumAny) (((MagickRealType) range*quantum)/QuantumRange+0.5));
 #else
-  return((QuantumAny) (((MagickRealType) range*quantum)/QuantumRange+0.0));
+  return((QuantumAny) (((MagickRealType) range*quantum)/QuantumRange+0.5));
 #endif
 }
 
@@ -380,7 +380,7 @@ static inline Quantum ScaleShortToQuantum(const unsigned short value)
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((Quantum) ((value+128U)/257U));
 #else
-  return((Quantum) (value/257.0+0.0));
+  return((Quantum) (value/257.0+0.5));
 #endif
 }
 #elif (MAGICKCORE_QUANTUM_DEPTH == 16)
@@ -389,7 +389,7 @@ static inline Quantum ScaleCharToQuantum(const unsigned char value)
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((Quantum) (257U*value));
 #else
-  return((Quantum) (257.0*value+0.0));
+  return((Quantum) (257.0*value+0.5));
 #endif
 }
 
@@ -399,7 +399,7 @@ static inline Quantum ScaleLongToQuantum(const unsigned long value)
   return((Quantum) ((value+MagickULLConstant(32768))/
     MagickULLConstant(65537)));
 #else
-  return((Quantum) (value/65537.0+0.0));
+  return((Quantum) (value/65537.0+0.5));
 #endif
 }
 
@@ -467,7 +467,7 @@ static inline Quantum ScaleCharToQuantum(const unsigned char value)
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((Quantum) (16843009UL*value));
 #else
-  return((Quantum) (16843009.0*value+0.0));
+  return((Quantum) (16843009.0*value+0.5));
 #endif
 }
 
@@ -529,16 +529,16 @@ static inline Quantum ScaleShortToQuantum(const unsigned short value)
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((Quantum) (65537UL*value));
 #else
-  return((Quantum) (65537.0*value+0.0));
+  return((Quantum) (65537.0*value+0.5));
 #endif
 }
 #elif (MAGICKCORE_QUANTUM_DEPTH == 64)
 static inline Quantum ScaleCharToQuantum(const unsigned char value)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((Quantum) (MagickULLConstant(71777214294589693)*value));
+  return((Quantum) (MagickULLConstant(72340172838076673)*value));
 #else
-  return((Quantum) (71777214294589693.0*value+0.0));
+  return((Quantum) (72340172838076673.0*value+0.5));
 #endif
 }
 
@@ -547,7 +547,7 @@ static inline Quantum ScaleLongToQuantum(const unsigned long value)
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((Quantum) (4294967295UL*value));
 #else
-  return((Quantum) (4294967295.0*value+0.0));
+  return((Quantum) (4294967295.0*value+0.5));
 #endif
 }
 
@@ -582,7 +582,7 @@ static inline unsigned long ScaleQuantumToMap(const Quantum quantum)
   if ((quantum/281479271743489.0) >= MaxMap)
     return((unsigned long) MaxMap);
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((unsigned long) ((quantum+140739635871744.0)/281479271743489.0));
+  return((unsigned long) ((quantum+2147450879.0)/281479271743489.0));
 #else
   return((unsigned long) (quantum/281479271743489.0)+0.5);
 #endif
@@ -591,7 +591,7 @@ static inline unsigned long ScaleQuantumToMap(const Quantum quantum)
 static inline unsigned short ScaleQuantumToShort(const Quantum quantum)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((unsigned short) ((quantum+140739635871744.0)/281479271743489.0));
+  return((unsigned short) ((quantum+2147450879.0)/281479271743489.0));
 #else
   return((unsigned short) (quantum/281479271743489.0+0.5));
 #endif

diff --git a/magick/quantum.h b/magick/quantum.h
index fce9c8a438f11d91c53db1db2304155466689d86..7b3290e7881349490fdff62a7ebb1bfc9410b1c9 100644 (file)
--- a/magick/quantum.h
+++ b/magick/quantum.h
@@ -87,10 +87,10 @@ static inline Quantum ClampToQuantum(const MagickRealType value)
     return((Quantum) 0);
   if (value >= (MagickRealType) QuantumRange)
     return((Quantum) QuantumRange);
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((Quantum) (value+0.5));
-#else
+#if defined(MAGICKCORE_HDRI_SUPPORT)
   return((Quantum) value);
+#else
+  return((Quantum) (value+0.5));
 #endif
 }
 
@@ -138,7 +138,7 @@ static inline unsigned char ScaleQuantumToChar(const Quantum quantum)
 static inline unsigned char ScaleQuantumToChar(const Quantum quantum)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((unsigned char) ((quantum+2155839615.0)/72340172838076673.0));
+  return((unsigned char) ((quantum+36170086419038336.0)/72340172838076673.0));
 #else
   return((unsigned char) (quantum/72340172838076673.0+0.5));
 #endif