From: cristy Date: Tue, 12 Feb 2013 18:08:53 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4256 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbe792053be1279f1a7f2c599888a93ec020233b;p=imagemagick --- diff --git a/MagickCore/composite.c b/MagickCore/composite.c index dfcaa94be..65b9f9f4b 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -220,8 +220,7 @@ static void HCLComposite(const MagickRealType hue,const MagickRealType chroma, h, m, r, - x, - z; + x; /* Convert HCL to RGB colorspace. @@ -271,25 +270,9 @@ static void HCLComposite(const MagickRealType hue,const MagickRealType chroma, b=x; } m=luma-(0.298839f*r+0.586811f*g+0.114350f*b); - /* - Choose saturation strategy to clip it into the RGB cube; hue and luma are - preserved and chroma may be changed. - */ - z=1.0; - if (m < 0.0) - { - z=luma/(luma-m); - m=0.0; - } - else - if (m+c > 1.0) - { - z=(1.0-luma)/(m+c-luma); - m=1.0-z*c; - } - *red=QuantumRange*(z*r+m); - *green=QuantumRange*(z*g+m); - *blue=QuantumRange*(z*b+m); + *red=QuantumRange*(r+m); + *green=QuantumRange*(g+m); + *blue=QuantumRange*(b+m); } static void CompositeHCL(const MagickRealType red,const MagickRealType green,