(no commit message)

diff --git a/MagickCore/magick-type.h b/MagickCore/magick-type.h
index a03672052f30d7f40cf675c52d0213fae78a2f58..1459685bf2183452c1ed16bb3a24dd8dbc38adf9 100644 (file)
--- a/MagickCore/magick-type.h
+++ b/MagickCore/magick-type.h
@@ -37,7 +37,7 @@ extern "C" {
 #endif
 
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)
-#define MagickEpsilon  1.0e-6
+#define MagickEpsilon  ((MagickRealType) 1.0e-6)
 #define MaxColormapSize  256UL
 #define MaxMap  255UL
 
@@ -56,7 +56,7 @@ typedef unsigned char Quantum;
 #define QuantumFormat  "%u"
 #endif
 #elif (MAGICKCORE_QUANTUM_DEPTH == 16)
-#define MagickEpsilon  1.0e-10
+#define MagickEpsilon  ((MagickRealType) 1.0e-10)
 #define MaxColormapSize  65536UL
 #define MaxMap  65535UL
 
@@ -75,7 +75,7 @@ typedef unsigned short Quantum;
 #define QuantumFormat  "%u"
 #endif
 #elif (MAGICKCORE_QUANTUM_DEPTH == 32)
-#define MagickEpsilon  1.0e-10
+#define MagickEpsilon  ((MagickRealType) 1.0e-10)
 #define MaxColormapSize  65536UL
 #define MaxMap  65535UL
 
@@ -90,7 +90,7 @@ typedef unsigned int Quantum;
 #define QuantumFormat  "%u"
 #endif
 #elif (MAGICKCORE_QUANTUM_DEPTH == 64) && defined(MAGICKCORE_HAVE_LONG_DOUBLE_WIDER)
-#define MagickEpsilon  1.0e-10
+#define MagickEpsilon  ((MagickRealType) 1.0e-10)
 #define MaxColormapSize  65536UL
 #define MaxMap  65535UL
 

diff --git a/MagickCore/pixel-private.h b/MagickCore/pixel-private.h
index 255cc1f7139b87fe260a306a5655b80b9ac76ed3..58dc5111493bb48626a39c73f3cb8fa5bb1a1653 100644 (file)
--- a/MagickCore/pixel-private.h
+++ b/MagickCore/pixel-private.h
@@ -31,8 +31,7 @@ static inline MagickRealType AlphaReciprocal(const MagickRealType alpha)
     Reciprocal alpha: clamp to [MagickEpsilon,1], return reciprocal.
   */
   beta=(alpha > (MagickRealType) 1.0 ? (MagickRealType) 1.0 : alpha);
-  beta=(beta < (MagickRealType) MagickEpsilon ? (MagickRealType) 
-    MagickEpsilon : beta);
+  beta=(beta < MagickEpsilon ? MagickEpsilon : beta);
   return((MagickRealType) 1.0/beta);
 }