(no commit message)

diff --git a/magick/quantum-private.h b/magick/quantum-private.h
index 7b7adbbd4ae68a4ab8170b60d646dc4630d2db8a..9e5ce3e871bb684cfd93a5f2bbddc0e4dfcfc8ed 100644 (file)
--- a/magick/quantum-private.h
+++ b/magick/quantum-private.h
@@ -526,7 +526,7 @@ static inline Quantum ScaleShortToQuantum(const unsigned short value)
 static inline Quantum ScaleCharToQuantum(const unsigned char value)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((Quantum) (MagickULLConstant(72340172838076673)*value));
+  return((Quantum) (72340172838076673.0*value+0.5));
 #else
   return((Quantum) (72340172838076673.0*value));
 #endif
@@ -535,7 +535,7 @@ static inline Quantum ScaleCharToQuantum(const unsigned char value)
 static inline Quantum ScaleLongToQuantum(const unsigned long value)
 {
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((Quantum) (4294967295UL*value));
+  return((Quantum) (4294967295.0*value+0.5));
 #else
   return((Quantum) (4294967295.0*value));
 #endif

diff --git a/magick/quantum.h b/magick/quantum.h
index b23c31bc49310c58c2398897f8e628f019149730..75b4dfa57975997b7ed3a0c4601204941fd3a066 100644 (file)
--- a/magick/quantum.h
+++ b/magick/quantum.h
@@ -137,11 +137,7 @@ 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+36170086419038336.0)/72340172838076673.0));
-#else
   return((unsigned char) (quantum/72340172838076673.0+0.5));
-#endif
 }
 #endif