From: cristy Date: Sat, 14 Apr 2012 23:40:47 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5804 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ee7de534f47de9745326c91998d1a29a48ed71b;p=imagemagick --- diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 9a326738c..dd4d85595 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -706,7 +706,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend, blend_percentage.green=geometry_info.rho; blend_percentage.blue=geometry_info.rho; blend_percentage.black=geometry_info.rho; - blend_percentage.alpha=100.0; + blend_percentage.alpha=geometry_info.rho; if ((flags & SigmaValue) != 0) blend_percentage.green=geometry_info.sigma; if ((flags & XiValue) != 0) diff --git a/MagickCore/paint.c b/MagickCore/paint.c index 3b70e53ec..ca64b58d8 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -173,7 +173,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image, return(MagickFalse); if (IsGrayColorspace(image->colorspace) != MagickFalse) (void) TransformImageColorspace(image,sRGBColorspace,exception); - if ((target->matte != MagickFalse) && (image->matte == MagickFalse)) + if ((image->matte == MagickFalse) && (draw_info->fill.matte != MagickFalse)) (void) SetImageAlpha(image,OpaqueAlpha,exception); /* Set floodfill state.