From e71f2945272e0f5ae9cc6defab5c27270db89165 Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 4 Apr 2012 11:07:05 +0000 Subject: [PATCH] --- MagickCore/fx.c | 5 ++++- MagickWand/operation.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/MagickCore/fx.c b/MagickCore/fx.c index ff60c5b7d..b8746f5f8 100644 --- 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 3db8566ac..840c6f922 100644 --- 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); -- 2.40.0