commit e71f2945272e0f5ae9cc6defab5c27270db89165
author cristy <urban-warrior@git.imagemagick.org> Wed Apr 04 11:07:05 2012 +0000
committer cristy <urban-warrior@git.imagemagick.org> Wed Apr 04 11:07:05 2012 +0000
tree 822edefe679adc875aeed31579c0575ec91e640b
parent 207ce4799e551406c76dc05e874141a08c63adb7

MagickCore/fx.c

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index ff60c5b..b8746f5 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -699,6 +699,7 @@
   pixel.red=geometry_info.rho;
   pixel.green=geometry_info.rho;
   pixel.blue=geometry_info.rho;
+  pixel.black=geometry_info.rho;
   pixel.alpha=100.0;
   if ((flags & SigmaValue) != 0)
     pixel.green=geometry_info.sigma;
@@ -708,12 +709,14 @@
     pixel.alpha=geometry_info.psi;
   if (pixel.colorspace == CMYKColorspace)
     {
-      pixel.black=geometry_info.rho;
       if ((flags & PsiValue) != 0)
         pixel.black=geometry_info.psi;
       if ((flags & ChiValue) != 0)
         pixel.alpha=geometry_info.chi;
     }
+  if ((colorize_image->colorspace == GRAYColorspace) &&
+      (IsPixelInfoGray(&pixel) != MagickFalse))
+    (void) SetImageColorspace(colorize_image,sRGBColorspace,exception);
   /*
     Colorize DirectClass image.
   */

MagickWand/operation.c

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 3db8566..840c6f9 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -4560,7 +4560,7 @@
 
     /* Expand the filename argument (meta-characters or "@filelist" ) */
     argc = 1;
-    argv = &arg1;
+    argv = (char **) &arg1;
     MagickBooleanType
       status=ExpandFilenames(&argc,&argv);