(no commit message)

diff --git a/MagickCore/quantum-private.h b/MagickCore/quantum-private.h
index cd46e54ced9c859e9c019123a6edac45d7a8ca83..bc0b7d5caa2a0fd5b859aa9b622c29fa9289a509 100644 (file)
--- a/MagickCore/quantum-private.h
+++ b/MagickCore/quantum-private.h
@@ -299,17 +299,7 @@ static inline Quantum ScaleLongToQuantum(const unsigned int value)
 #endif
 }
 
-static inline Quantum ScaleLongLongToQuantum(const MagickSizeType value)
-{
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((Quantum) ((value+MagickULLConstant(551911719039))/
-    MagickULLConstant(1103823438079)));
-#else
-  return((Quantum) (value/1103823438079.0));
-#endif
-}
-
-static inline Quantum ScaleMapToQuantum(const MagickRealType value)
+static inline Quantum ScaleMapToQuantum(const double value)
 {
   if (value <= 0.0)
     return((Quantum) 0);
@@ -335,19 +325,6 @@ static inline unsigned int ScaleQuantumToLong(const Quantum quantum)
 #endif
 }
 
-static inline MagickSizeType ScaleQuantumToLongLong(const Quantum quantum)
-{
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((MagickSizeType) (MagickULLConstant(551911719039)*quantum));
-#else
-  if (quantum <= 0.0)
-    return(0UL);
-  if ((551911719039.0*quantum) >= 18446744073709551615.0)
-    return(MagickULLConstant(18446744073709551615));
-  return((MagickSizeType) (1103823438079.0*quantum+0.5));
-#endif
-}
-
 static inline unsigned int ScaleQuantumToMap(const Quantum quantum)
 {
   if (quantum >= (Quantum) MaxMap)
@@ -402,17 +379,7 @@ static inline Quantum ScaleLongToQuantum(const unsigned int value)
 #endif
 }
 
-static inline Quantum ScaleLongLongToQuantum(const MagickSizeType value)
-{
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((Quantum) ((value+MagickULLConstant(8421376))/
-    MagickULLConstant(16842752)));
-#else
-  return((Quantum) (value/16842752.0));
-#endif
-}
-
-static inline Quantum ScaleMapToQuantum(const MagickRealType value)
+static inline Quantum ScaleMapToQuantum(const double value)
 {
   if (value <= 0.0)
     return((Quantum) 0);
@@ -438,19 +405,6 @@ static inline unsigned int ScaleQuantumToLong(const Quantum quantum)
 #endif
 }
 
-static inline MagickSizeType ScaleQuantumToLongLong(const Quantum quantum)
-{
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((MagickSizeType) (MagickULLConstant(16842752)*quantum));
-#else
-  if (quantum <= 0.0)
-    return(0UL);
-  if ((65537.0*quantum) >= 18446744073709551615.0)
-    return(MagickULLConstant(18446744073709551615));
-  return((MagickSizeType) (16842752.0*quantum+0.5));
-#endif
-}
-
 static inline unsigned int ScaleQuantumToMap(const Quantum quantum)
 {
   if (quantum >= (Quantum) MaxMap)
@@ -496,12 +450,7 @@ static inline Quantum ScaleLongToQuantum(const unsigned int value)
   return((Quantum) value);
 }
 
-static inline Quantum ScaleLongLongToQuantum(const MagickSizeType value)
-{
-  return((Quantum) value);
-}
-
-static inline Quantum ScaleMapToQuantum(const MagickRealType value)
+static inline Quantum ScaleMapToQuantum(const double value)
 {
   if (value <= 0.0)
     return((Quantum) 0);
@@ -519,19 +468,14 @@ static inline unsigned int ScaleQuantumToLong(const Quantum quantum)
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((unsigned int) quantum);
 #else
+  if (quantum <= 0.0)
+    return(0);
+  if ((quantum) >= 4294967295.0)
+    return(4294967295);
   return((unsigned int) (quantum+0.5));
 #endif
 }
 
-static inline MagickSizeType ScaleQuantumToLongLong(const Quantum quantum)
-{
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
-  return((MagickSizeType) quantum);
-#else
-  return((MagickSizeType) (quantum+0.5));
-#endif
-}
-
 static inline unsigned int ScaleQuantumToMap(const Quantum quantum)
 {
   if (quantum < 0.0)
@@ -579,12 +523,7 @@ static inline Quantum ScaleLongToQuantum(const unsigned int value)
   return((Quantum) (4294967297.0*value));
 }
 
-static inline Quantum ScaleLongLongToQuantum(const MagickSizeType value)
-{
-  return((Quantum) (18446744073709551615.0*value));
-}
-
-static inline Quantum ScaleMapToQuantum(const MagickRealType value)
+static inline Quantum ScaleMapToQuantum(const double value)
 {
   if (value <= 0.0)
     return((Quantum) 0);
@@ -598,11 +537,6 @@ static inline unsigned int ScaleQuantumToLong(const Quantum quantum)
   return((unsigned int) (quantum/4294967297.0+0.5));
 }
 
-static inline MagickSizeType ScaleQuantumToLongLong(const Quantum quantum)
-{
-  return((MagickSizeType) (quantum/18446744073709551615.0+0.5));
-}
-
 static inline unsigned int ScaleQuantumToMap(const Quantum quantum)
 {
   if (quantum <= 0.0)