diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 20eef65..114ac84 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -742,8 +742,8 @@
/*
Determine RGB values of the pen color.
*/
- flags=ParseGeometry(blend,&geometry_info);
GetPixelInfo(image,&pixel);
+ flags=ParseGeometry(blend,&geometry_info);
pixel.red=geometry_info.rho;
pixel.green=geometry_info.rho;
pixel.blue=geometry_info.rho;
@@ -5097,21 +5097,21 @@
%
% The format of the TintImage method is:
%
-% Image *TintImage(const Image *image,const char *opacity,
+% Image *TintImage(const Image *image,const char *blend,
% const PixelInfo *tint,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% o image: the image.
%
-% o opacity: A color value used for tinting.
+% o blend: A color value used for tinting.
%
% o tint: A color value used for tinting.
%
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport Image *TintImage(const Image *image,const char *opacity,
+MagickExport Image *TintImage(const Image *image,const char *blend,
const PixelInfo *tint,ExceptionInfo *exception)
{
#define TintImageTag "Tint/Image"
@@ -5168,26 +5168,25 @@
Determine RGB values of the color.
*/
GetPixelInfo(image,&pixel);
- flags=ParseGeometry(opacity,&geometry_info);
+ flags=ParseGeometry(blend,&geometry_info);
pixel.red=geometry_info.rho;
pixel.green=geometry_info.rho;
pixel.blue=geometry_info.rho;
- pixel.black=geometry_info.rho;
pixel.alpha=OpaqueAlpha;
if ((flags & SigmaValue) != 0)
pixel.green=geometry_info.sigma;
if ((flags & XiValue) != 0)
pixel.blue=geometry_info.xi;
+ if ((flags & PsiValue) != 0)
+ pixel.alpha=geometry_info.psi;
if (image->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;
}
- else
- if ((flags & PsiValue) != 0)
- pixel.alpha=geometry_info.psi;
intensity=(MagickRealType) GetPixelInfoIntensity(tint);
color_vector.red=(MagickRealType) (pixel.red*tint->red/100.0-intensity);
color_vector.green=(MagickRealType) (pixel.green*tint->green/100.0-intensity);