From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 4 Aug 2012 21:57:46 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5192
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9301758008919bfb7be953c0f64cb4e7fdb3545;p=imagemagick

---

diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c
index 5bbbdecab..520760538 100644
--- 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 5035b9bd1..408907483 100644
--- 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);