(no commit message)

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index ff60c5b7d6c8686940d3b19b6efa164558664fa7..b8746f5f85fefc521b052561c0be13e42d8f5521 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -699,6 +699,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend,
   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 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend,
     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.
   */

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