(no commit message)

diff --git a/magick/magick-type.h b/magick/magick-type.h
index e8f471cec86208467c0eec88a8294446ebd420c5..72a1878528068d474fb0b49ca82cc9bf3ccf6f98 100644 (file)
--- a/magick/magick-type.h
+++ b/magick/magick-type.h
@@ -37,7 +37,7 @@ extern "C" {
 #endif
 
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)
-#define MagickEpsilon  (2.0*1.1920928955078125e-07)
+#define MagickEpsilon  1.0e-6
 #define MagickHuge     1.0e6
 #define MaxColormapSize  256UL
 #define MaxMap  255UL
@@ -53,7 +53,7 @@ typedef unsigned char Quantum;
 #define QuantumFormat  "%u"
 #endif
 #elif (MAGICKCORE_QUANTUM_DEPTH == 16)
-#define MagickEpsilon  (2.0*2.2204460492503131e-16)
+#define MagickEpsilon  1.0e-10
 #define MagickHuge     1.0e12
 #define MaxColormapSize  65536UL
 #define MaxMap  65535UL
@@ -69,7 +69,7 @@ typedef unsigned short Quantum;
 #define QuantumFormat  "%u"
 #endif
 #elif (MAGICKCORE_QUANTUM_DEPTH == 32)
-#define MagickEpsilon  (2.0*2.2204460492503131e-16)
+#define MagickEpsilon  1.0e-10
 #define MagickHuge     1.0e12
 #define MaxColormapSize  65536UL
 #define MaxMap  65535UL
@@ -85,7 +85,7 @@ typedef unsigned int Quantum;
 #define QuantumFormat  "%u"
 #endif
 #elif (MAGICKCORE_QUANTUM_DEPTH == 64) && defined(MAGICKCORE_HAVE_LONG_DOUBLE_WIDER)
-#define MagickEpsilon  (2.0*2.2204460492503131e-16)
+#define MagickEpsilon  1.0e-10
 #define MagickHuge     1.0e12
 #define MaxColormapSize  65536UL
 #define MaxMap  65535UL

diff --git a/magick/pixel.h b/magick/pixel.h
index d66498356214d5eee65d6b8ca21887c129ef28a3..660d0db8c0ef2c58e19d6840332ca9bed3286fa7 100644 (file)
--- a/magick/pixel.h
+++ b/magick/pixel.h
@@ -35,7 +35,7 @@ extern "C" {
 #define GetGreenPixelComponent(p) ((p)->green)
 #define GetBluePixelComponent(p) ((p)->blue)
 #define GetOpacityPixelComponent(p) ((p)->opacity)
-#define GetAlphaPixelComponent(p) ((Quantum) (QuantumRange-(p)->opacity))
+#define GetAlphaPixelComponent(p) (QuantumRange-(p)->opacity)
 #define GetIndexPixelComponent(p) ((p)->index)
 
 #define SetRedPixelComponent(q,component) ((q)->red=(component))