(no commit message)

diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c
index 5bbbdecabf2eec1ac973c8d706edbd75f9da074c..520760538ec21cf3a351a1c7d7e18321434b67fc 100644 (file)
--- a/MagickCore/accelerate.c
+++ b/MagickCore/accelerate.c
@@ -295,7 +295,7 @@ static const char
     "      break;\n"
     "    }\n"
     "  }\n"
-    "  gamma=MagickEpsilonReciprocal(gamma);\n"
+    "  gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);\n"
     "  const unsigned long index = y*columns+x;\n"
     "  output[index].x=ClampToQuantum(gamma*sum.x);\n"
     "  output[index].y=ClampToQuantum(gamma*sum.y);\n"

diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index 5035b9bd1593d1ec93499abde0103af5ee0cd197..4089074830c4082ce7598e8a458cc7efdb8f0211 100644 (file)
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -779,7 +779,7 @@ MagickExport MagickBooleanType OpaquePaintImage(Image *image,
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
-      (IsPixelInfoGray(fill) != MagickFalse))
+      (IsPixelInfoGray(fill) == MagickFalse))
     (void) TransformImageColorspace(image,RGBColorspace,exception);
   if ((fill->matte != MagickFalse) && (image->matte == MagickFalse))
     (void) SetImageAlpha(image,OpaqueAlpha,exception);