From cf12ee4f30a90a786183b9619af888209b670848 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 14 Jun 2012 11:02:23 +0000 Subject: [PATCH] --- MagickCore/color.c | 6 ++-- MagickCore/colorspace-private.h | 2 +- MagickCore/colorspace.c | 30 +++++++++--------- MagickCore/distort.c | 2 +- MagickCore/enhance.c | 16 +++++----- MagickCore/fx.c | 6 ++-- MagickCore/gem-private.h | 8 ++--- MagickCore/gem.c | 56 ++++++++++++++++----------------- MagickCore/gem.h | 4 +-- MagickCore/methods.h | 12 +++---- MagickWand/pixel-wand.c | 4 +-- coders/null.c | 2 +- filters/analyze.c | 2 +- 13 files changed, 75 insertions(+), 75 deletions(-) diff --git a/MagickCore/color.c b/MagickCore/color.c index 52ad07b1f..06870d170 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -2357,16 +2357,16 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, geometry_info.sigma*=scale; geometry_info.xi*=scale; if (LocaleCompare(colorspace,"HSB") == 0) - ConvertHSBToRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/ + ConvertHSBTosRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/ 360.0,geometry_info.sigma,geometry_info.xi,&pixel.red, &pixel.green,&pixel.blue); else if (LocaleCompare(colorspace,"HSL") == 0) - ConvertHSLToRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/ + ConvertHSLTosRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/ 360.0,geometry_info.sigma,geometry_info.xi,&pixel.red, &pixel.green,&pixel.blue); else - ConvertHWBToRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/ + ConvertHWBTosRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/ 360.0,geometry_info.sigma,geometry_info.xi,&pixel.red, &pixel.green,&pixel.blue); color->colorspace=sRGBColorspace; diff --git a/MagickCore/colorspace-private.h b/MagickCore/colorspace-private.h index 0cb6041cf..d1c5e22f2 100644 --- a/MagickCore/colorspace-private.h +++ b/MagickCore/colorspace-private.h @@ -26,7 +26,7 @@ extern "C" { #include #include -static inline void ConvertRGBToCMYK(PixelInfo *pixel) +static inline void ConvertsRGBToCMYK(PixelInfo *pixel) { MagickRealType black, diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c index 9781b0017..4490233c1 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -115,7 +115,7 @@ static MagickBooleanType % */ -static inline void ConvertRGBToXYZ(const Quantum red,const Quantum green, +static inline void ConvertsRGBToXYZ(const Quantum red,const Quantum green, const Quantum blue,double *X,double *Y,double *Z) { double @@ -332,7 +332,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, for (x=0; x < (ssize_t) image->columns; x++) { GetPixelInfoPixel(image,q,&pixel); - ConvertRGBToCMYK(&pixel); + ConvertsRGBToCMYK(&pixel); SetPixelInfoPixel(image,&pixel,q); q+=GetPixelChannels(image); } @@ -392,7 +392,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, brightness=0.0; for (x=0; x < (ssize_t) image->columns; x++) { - ConvertRGBToHSB((double) GetPixelRed(image,q), + ConvertsRGBToHSB((double) GetPixelRed(image,q), (double) GetPixelGreen(image,q),(double) GetPixelBlue(image,q), &hue,&saturation,&brightness); SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange* @@ -457,7 +457,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, lightness=0.0; for (x=0; x < (ssize_t) image->columns; x++) { - ConvertRGBToHSL((double) GetPixelRed(image,q),(double) + ConvertsRGBToHSL((double) GetPixelRed(image,q),(double) GetPixelGreen(image,q),(double) GetPixelBlue(image,q), &hue,&saturation,&lightness); SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange* @@ -522,7 +522,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, blackness=0.0; for (x=0; x < (ssize_t) image->columns; x++) { - ConvertRGBToHWB((double) GetPixelRed(image,q),(double) + ConvertsRGBToHWB((double) GetPixelRed(image,q),(double) GetPixelGreen(image,q),(double) GetPixelBlue(image,q), &hue,&whiteness,&blackness); SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange* @@ -593,7 +593,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, Z=0.0; for (x=0; x < (ssize_t) image->columns; x++) { - ConvertRGBToXYZ(GetPixelRed(image,q),GetPixelGreen(image,q), + ConvertsRGBToXYZ(GetPixelRed(image,q),GetPixelGreen(image,q), GetPixelBlue(image,q),&X,&Y,&Z); ConvertXYZToLab(X,Y,Z,&L,&a,&b); SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange* @@ -757,7 +757,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, Z=0.0; for (x=0; x < (ssize_t) image->columns; x++) { - ConvertRGBToXYZ(GetPixelRed(image,q),GetPixelGreen(image,q), + ConvertsRGBToXYZ(GetPixelRed(image,q),GetPixelGreen(image,q), GetPixelBlue(image,q),&X,&Y,&Z); SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*X),q); SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*Y), @@ -1442,7 +1442,7 @@ static inline ssize_t RoundToYCC(const MagickRealType value) return((ssize_t) (value+0.5)); } -static inline void ConvertXYZToRGB(const double x,const double y,const double z, +static inline void ConvertXYZTosRGB(const double x,const double y,const double z, Quantum *red,Quantum *green,Quantum *blue) { double @@ -1476,7 +1476,7 @@ static inline void ConvertXYZToRGB(const double x,const double y,const double z, *blue=RoundToQuantum((MagickRealType) QuantumRange*b); } -static inline void ConvertCMYKToRGB(PixelInfo *pixel) +static inline void ConvertCMYKTosRGB(PixelInfo *pixel) { pixel->red=(MagickRealType) QuantumRange-(QuantumScale*pixel->red* (QuantumRange-pixel->black)+pixel->black); @@ -1862,7 +1862,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, for (x=0; x < (ssize_t) image->columns; x++) { GetPixelInfoPixel(image,q,&pixel); - ConvertCMYKToRGB(&pixel); + ConvertCMYKTosRGB(&pixel); SetPixelInfoPixel(image,&pixel,q); q+=GetPixelChannels(image); } @@ -1927,7 +1927,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, hue=(double) (QuantumScale*GetPixelRed(image,q)); saturation=(double) (QuantumScale*GetPixelGreen(image,q)); brightness=(double) (QuantumScale*GetPixelBlue(image,q)); - ConvertHSBToRGB(hue,saturation,brightness,&red,&green,&blue); + ConvertHSBTosRGB(hue,saturation,brightness,&red,&green,&blue); SetPixelRed(image,ClampToQuantum(red),q); SetPixelGreen(image,ClampToQuantum(green),q); SetPixelBlue(image,ClampToQuantum(blue),q); @@ -1994,7 +1994,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, hue=(double) (QuantumScale*GetPixelRed(image,q)); saturation=(double) (QuantumScale*GetPixelGreen(image,q)); lightness=(double) (QuantumScale*GetPixelBlue(image,q)); - ConvertHSLToRGB(hue,saturation,lightness,&red,&green,&blue); + ConvertHSLTosRGB(hue,saturation,lightness,&red,&green,&blue); SetPixelRed(image,ClampToQuantum(red),q); SetPixelGreen(image,ClampToQuantum(green),q); SetPixelBlue(image,ClampToQuantum(blue),q); @@ -2061,7 +2061,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, hue=(double) (QuantumScale*GetPixelRed(image,q)); whiteness=(double) (QuantumScale*GetPixelGreen(image,q)); blackness=(double) (QuantumScale*GetPixelBlue(image,q)); - ConvertHWBToRGB(hue,whiteness,blackness,&red,&green,&blue); + ConvertHWBTosRGB(hue,whiteness,blackness,&red,&green,&blue); SetPixelRed(image,ClampToQuantum(red),q); SetPixelGreen(image,ClampToQuantum(green),q); SetPixelBlue(image,ClampToQuantum(blue),q); @@ -2135,7 +2135,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, a=QuantumScale*GetPixelGreen(image,q); b=QuantumScale*GetPixelBlue(image,q); ConvertLabToXYZ(L,a,b,&X,&Y,&Z); - ConvertXYZToRGB(X,Y,Z,&red,&green,&blue); + ConvertXYZTosRGB(X,Y,Z,&red,&green,&blue); SetPixelRed(image,red,q); SetPixelGreen(image,green,q); SetPixelBlue(image,blue,q); @@ -2300,7 +2300,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, X=QuantumScale*GetPixelRed(image,q); Y=QuantumScale*GetPixelGreen(image,q); Z=QuantumScale*GetPixelBlue(image,q); - ConvertXYZToRGB(X,Y,Z,&red,&green,&blue); + ConvertXYZTosRGB(X,Y,Z,&red,&green,&blue); SetPixelRed(image,red,q); SetPixelGreen(image,green,q); SetPixelBlue(image,blue,q); diff --git a/MagickCore/distort.c b/MagickCore/distort.c index 279d6b652..90259096e 100644 --- a/MagickCore/distort.c +++ b/MagickCore/distort.c @@ -2373,7 +2373,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method, invalid=distort_image->matte_color; if (distort_image->colorspace == CMYKColorspace) - ConvertRGBToCMYK(&invalid); /* what about other color spaces? */ + ConvertsRGBToCMYK(&invalid); /* what about other color spaces? */ for (i=0; i < (ssize_t) distort_image->columns; i++) { /* map pixel coordinate to distortion space coordinate */ diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index e3884effe..6bd8fedf4 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -856,7 +856,7 @@ static void Contrast(const int sign,double *red,double *green,double *blue) hue=0.0; saturation=0.0; brightness=0.0; - ConvertRGBToHSB(*red,*green,*blue,&hue,&saturation,&brightness); + ConvertsRGBToHSB(*red,*green,*blue,&hue,&saturation,&brightness); brightness+=0.5*sign*(0.5*(sin((double) (MagickPI*(brightness-0.5)))+1.0)- brightness); if (brightness > 1.0) @@ -864,7 +864,7 @@ static void Contrast(const int sign,double *red,double *green,double *blue) else if (brightness < 0.0) brightness=0.0; - ConvertHSBToRGB(hue,saturation,brightness,red,green,blue); + ConvertHSBTosRGB(hue,saturation,brightness,red,green,blue); } MagickExport MagickBooleanType ContrastImage(Image *image, @@ -2779,7 +2779,7 @@ static void ModulateHSB(const double percent_hue, assert(red != (double *) NULL); assert(green != (double *) NULL); assert(blue != (double *) NULL); - ConvertRGBToHSB(*red,*green,*blue,&hue,&saturation,&brightness); + ConvertsRGBToHSB(*red,*green,*blue,&hue,&saturation,&brightness); hue+=0.5*(0.01*percent_hue-1.0); while (hue < 0.0) hue+=1.0; @@ -2787,7 +2787,7 @@ static void ModulateHSB(const double percent_hue, hue-=1.0; saturation*=0.01*percent_saturation; brightness*=0.01*percent_brightness; - ConvertHSBToRGB(hue,saturation,brightness,red,green,blue); + ConvertHSBTosRGB(hue,saturation,brightness,red,green,blue); } static void ModulateHSL(const double percent_hue, @@ -2805,7 +2805,7 @@ static void ModulateHSL(const double percent_hue, assert(red != (double *) NULL); assert(green != (double *) NULL); assert(blue != (double *) NULL); - ConvertRGBToHSL(*red,*green,*blue,&hue,&saturation,&lightness); + ConvertsRGBToHSL(*red,*green,*blue,&hue,&saturation,&lightness); hue+=0.5*(0.01*percent_hue-1.0); while (hue < 0.0) hue+=1.0; @@ -2813,7 +2813,7 @@ static void ModulateHSL(const double percent_hue, hue-=1.0; saturation*=0.01*percent_saturation; lightness*=0.01*percent_lightness; - ConvertHSLToRGB(hue,saturation,lightness,red,green,blue); + ConvertHSLTosRGB(hue,saturation,lightness,red,green,blue); } static void ModulateHWB(const double percent_hue,const double percent_whiteness, const double percent_blackness,double *red,double *green,double *blue) @@ -2829,7 +2829,7 @@ static void ModulateHWB(const double percent_hue,const double percent_whiteness, assert(red != (double *) NULL); assert(green != (double *) NULL); assert(blue != (double *) NULL); - ConvertRGBToHWB(*red,*green,*blue,&hue,&whiteness,&blackness); + ConvertsRGBToHWB(*red,*green,*blue,&hue,&whiteness,&blackness); hue+=0.5*(0.01*percent_hue-1.0); while (hue < 0.0) hue+=1.0; @@ -2837,7 +2837,7 @@ static void ModulateHWB(const double percent_hue,const double percent_whiteness, hue-=1.0; blackness*=0.01*percent_blackness; whiteness*=0.01*percent_whiteness; - ConvertHWBToRGB(hue,whiteness,blackness,red,green,blue); + ConvertHWBTosRGB(hue,whiteness,blackness,red,green,blue); } MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate, diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 5c97ec285..fda15d7a8 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -1651,7 +1651,7 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, lightness, saturation; - ConvertRGBToHSL(pixel.red,pixel.green,pixel.blue,&hue,&saturation, + ConvertsRGBToHSL(pixel.red,pixel.green,pixel.blue,&hue,&saturation, &lightness); return(hue); } @@ -1695,7 +1695,7 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, lightness, saturation; - ConvertRGBToHSL(pixel.red,pixel.green,pixel.blue,&hue,&saturation, + ConvertsRGBToHSL(pixel.red,pixel.green,pixel.blue,&hue,&saturation, &lightness); return(lightness); } @@ -1770,7 +1770,7 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, lightness, saturation; - ConvertRGBToHSL(pixel.red,pixel.green,pixel.blue,&hue,&saturation, + ConvertsRGBToHSL(pixel.red,pixel.green,pixel.blue,&hue,&saturation, &lightness); return(saturation); } diff --git a/MagickCore/gem-private.h b/MagickCore/gem-private.h index 6c236bb3d..f034778bd 100644 --- a/MagickCore/gem-private.h +++ b/MagickCore/gem-private.h @@ -32,13 +32,13 @@ extern MagickPrivate size_t GetOptimalKernelWidth2D(const double,const double); extern MagickPrivate void - ConvertHSBToRGB(const double,const double,const double,double *,double *, + ConvertHSBTosRGB(const double,const double,const double,double *,double *, double *), - ConvertHWBToRGB(const double,const double,const double,double *,double *, + ConvertHWBTosRGB(const double,const double,const double,double *,double *, double *), - ConvertRGBToHSB(const double,const double,const double,double *,double *, + ConvertsRGBToHSB(const double,const double,const double,double *,double *, double *), - ConvertRGBToHWB(const double,const double,const double,double *,double *, + ConvertsRGBToHWB(const double,const double,const double,double *,double *, double *); #if defined(__cplusplus) || defined(c_plusplus) diff --git a/MagickCore/gem.c b/MagickCore/gem.c index 55fd0ca2c..5ae2c2292 100644 --- a/MagickCore/gem.c +++ b/MagickCore/gem.c @@ -69,12 +69,12 @@ % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% ConvertHSBToRGB() transforms a (hue, saturation, brightness) to a (red, +% ConvertHSBTosRGB() transforms a (hue, saturation, brightness) to a (red, % green, blue) triple. % -% The format of the ConvertHSBToRGBImage method is: +% The format of the ConvertHSBTosRGBImage method is: % -% void ConvertHSBToRGB(const double hue,const double saturation, +% void ConvertHSBTosRGB(const double hue,const double saturation, % const double brightness,double *red,double *green,double *blue) % % A description of each parameter follows: @@ -85,7 +85,7 @@ % o red, green, blue: A pointer to a pixel component of type Quantum. % */ -MagickPrivate void ConvertHSBToRGB(const double hue,const double saturation, +MagickPrivate void ConvertHSBTosRGB(const double hue,const double saturation, const double brightness,double *red,double *green,double *blue) { MagickRealType @@ -172,12 +172,12 @@ MagickPrivate void ConvertHSBToRGB(const double hue,const double saturation, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% ConvertHSLToRGB() transforms a (hue, saturation, lightness) to a (red, +% ConvertHSLTosRGB() transforms a (hue, saturation, lightness) to a (red, % green, blue) triple. % -% The format of the ConvertHSLToRGBImage method is: +% The format of the ConvertHSLTosRGBImage method is: % -% void ConvertHSLToRGB(const double hue,const double saturation, +% void ConvertHSLTosRGB(const double hue,const double saturation, % const double lightness,double *red,double *green,double *blue) % % A description of each parameter follows: @@ -189,7 +189,7 @@ MagickPrivate void ConvertHSBToRGB(const double hue,const double saturation, % */ -static inline MagickRealType ConvertHueToRGB(MagickRealType m1, +static inline MagickRealType ConvertHueTosRGB(MagickRealType m1, MagickRealType m2,MagickRealType hue) { if (hue < 0.0) @@ -205,7 +205,7 @@ static inline MagickRealType ConvertHueToRGB(MagickRealType m1, return(m1); } -MagickExport void ConvertHSLToRGB(const double hue,const double saturation, +MagickExport void ConvertHSLTosRGB(const double hue,const double saturation, const double lightness,double *red,double *green,double *blue) { MagickRealType @@ -233,9 +233,9 @@ MagickExport void ConvertHSLToRGB(const double hue,const double saturation, else m2=(lightness+saturation)-(lightness*saturation); m1=2.0*lightness-m2; - r=ConvertHueToRGB(m1,m2,hue+1.0/3.0); - g=ConvertHueToRGB(m1,m2,hue); - b=ConvertHueToRGB(m1,m2,hue-1.0/3.0); + r=ConvertHueTosRGB(m1,m2,hue+1.0/3.0); + g=ConvertHueTosRGB(m1,m2,hue); + b=ConvertHueTosRGB(m1,m2,hue-1.0/3.0); *red=(double) ClampToQuantum((MagickRealType) QuantumRange*r); *green=(double) ClampToQuantum((MagickRealType) QuantumRange*g); *blue=(double) ClampToQuantum((MagickRealType) QuantumRange*b); @@ -252,12 +252,12 @@ MagickExport void ConvertHSLToRGB(const double hue,const double saturation, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% ConvertHWBToRGB() transforms a (hue, whiteness, blackness) to a (red, green, +% ConvertHWBTosRGB() transforms a (hue, whiteness, blackness) to a (red, green, % blue) triple. % -% The format of the ConvertHWBToRGBImage method is: +% The format of the ConvertHWBTosRGBImage method is: % -% void ConvertHWBToRGB(const double hue,const double whiteness, +% void ConvertHWBTosRGB(const double hue,const double whiteness, % const double blackness,double *red,double *green,double *blue) % % A description of each parameter follows: @@ -268,7 +268,7 @@ MagickExport void ConvertHSLToRGB(const double hue,const double saturation, % o red, green, blue: A pointer to a pixel component of type Quantum. % */ -MagickPrivate void ConvertHWBToRGB(const double hue,const double whiteness, +MagickPrivate void ConvertHWBTosRGB(const double hue,const double whiteness, const double blackness,double *red,double *green,double *blue) { MagickRealType @@ -328,12 +328,12 @@ MagickPrivate void ConvertHWBToRGB(const double hue,const double whiteness, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% ConvertRGBToHSB() transforms a (red, green, blue) to a (hue, saturation, +% ConvertsRGBToHSB() transforms a (red, green, blue) to a (hue, saturation, % brightness) triple. % -% The format of the ConvertRGBToHSB method is: +% The format of the ConvertsRGBToHSB method is: % -% void ConvertRGBToHSB(const double red,const double green, +% void ConvertsRGBToHSB(const double red,const double green, % const double blue,double *hue,double *saturation,double *brightness) % % A description of each parameter follows: @@ -345,7 +345,7 @@ MagickPrivate void ConvertHWBToRGB(const double hue,const double whiteness, % component of the HSB color space. % */ -MagickPrivate void ConvertRGBToHSB(const double red,const double green, +MagickPrivate void ConvertsRGBToHSB(const double red,const double green, const double blue,double *hue,double *saturation,double *brightness) { MagickRealType @@ -398,12 +398,12 @@ MagickPrivate void ConvertRGBToHSB(const double red,const double green, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% ConvertRGBToHSL() transforms a (red, green, blue) to a (hue, saturation, +% ConvertsRGBToHSL() transforms a (red, green, blue) to a (hue, saturation, % lightness) triple. % -% The format of the ConvertRGBToHSL method is: +% The format of the ConvertsRGBToHSL method is: % -% void ConvertRGBToHSL(const double red,const double green, +% void ConvertsRGBToHSL(const double red,const double green, % const double blue,double *hue,double *saturation,double *lightness) % % A description of each parameter follows: @@ -430,7 +430,7 @@ static inline double MagickMin(const double x,const double y) return(y); } -MagickExport void ConvertRGBToHSL(const double red,const double green, +MagickExport void ConvertsRGBToHSL(const double red,const double green, const double blue,double *hue,double *saturation,double *lightness) { MagickRealType @@ -491,12 +491,12 @@ MagickExport void ConvertRGBToHSL(const double red,const double green, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% ConvertRGBToHWB() transforms a (red, green, blue) to a (hue, whiteness, +% ConvertsRGBToHWB() transforms a (red, green, blue) to a (hue, whiteness, % blackness) triple. % -% The format of the ConvertRGBToHWB method is: +% The format of the ConvertsRGBToHWB method is: % -% void ConvertRGBToHWB(const double red,const double green, +% void ConvertsRGBToHWB(const double red,const double green, % const double blue,double *hue,double *whiteness,double *blackness) % % A description of each parameter follows: @@ -508,7 +508,7 @@ MagickExport void ConvertRGBToHSL(const double red,const double green, % component of the HWB color space. % */ -MagickPrivate void ConvertRGBToHWB(const double red,const double green, +MagickPrivate void ConvertsRGBToHWB(const double red,const double green, const double blue,double *hue,double *whiteness,double *blackness) { long diff --git a/MagickCore/gem.h b/MagickCore/gem.h index 9dc8de612..244e72dca 100644 --- a/MagickCore/gem.h +++ b/MagickCore/gem.h @@ -29,9 +29,9 @@ extern MagickExport double ExpandAffine(const AffineMatrix *); extern MagickExport void - ConvertHSLToRGB(const double,const double,const double,double *,double *, + ConvertHSLTosRGB(const double,const double,const double,double *,double *, double *), - ConvertRGBToHSL(const double,const double,const double,double *,double *, + ConvertsRGBToHSL(const double,const double,const double,double *,double *, double *); #if defined(__cplusplus) || defined(c_plusplus) diff --git a/MagickCore/methods.h b/MagickCore/methods.h index 465d78e33..95f541194 100644 --- a/MagickCore/methods.h +++ b/MagickCore/methods.h @@ -209,12 +209,12 @@ extern "C" { #define ContrastImage PrependMagickMethod(ContrastImage) #define ContrastStretchImage PrependMagickMethod(ContrastStretchImage) #define ContrastStretchImage PrependMagickMethod(ContrastStretchImage) -#define ConvertHSBToRGB PrependMagickMethod(ConvertHSBToRGB) -#define ConvertHSLToRGB PrependMagickMethod(ConvertHSLToRGB) -#define ConvertHWBToRGB PrependMagickMethod(ConvertHWBToRGB) -#define ConvertRGBToHSB PrependMagickMethod(ConvertRGBToHSB) -#define ConvertRGBToHSL PrependMagickMethod(ConvertRGBToHSL) -#define ConvertRGBToHWB PrependMagickMethod(ConvertRGBToHWB) +#define ConvertHSBTosRGB PrependMagickMethod(ConvertHSBTosRGB) +#define ConvertHSLTosRGB PrependMagickMethod(ConvertHSLTosRGB) +#define ConvertHWBTosRGB PrependMagickMethod(ConvertHWBTosRGB) +#define ConvertsRGBToHSB PrependMagickMethod(ConvertsRGBToHSB) +#define ConvertsRGBToHSL PrependMagickMethod(ConvertsRGBToHSL) +#define ConvertsRGBToHWB PrependMagickMethod(ConvertsRGBToHWB) #define ConvolveImage PrependMagickMethod(ConvolveImage) #define ConvolveImage PrependMagickMethod(ConvolveImage) #define CopyMagickMemory PrependMagickMethod(CopyMagickMemory) diff --git a/MagickWand/pixel-wand.c b/MagickWand/pixel-wand.c index 15c5255cb..8ab75c747 100644 --- a/MagickWand/pixel-wand.c +++ b/MagickWand/pixel-wand.c @@ -1067,7 +1067,7 @@ WandExport void PixelGetHSL(const PixelWand *wand,double *hue, assert(wand->signature == WandSignature); if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - ConvertRGBToHSL((double) ClampToQuantum(wand->pixel.red),(double) + ConvertsRGBToHSL((double) ClampToQuantum(wand->pixel.red),(double) ClampToQuantum(wand->pixel.green),(double) ClampToQuantum(wand->pixel.blue), hue,saturation,lightness); } @@ -1976,7 +1976,7 @@ WandExport void PixelSetHSL(PixelWand *wand,const double hue, assert(wand->signature == WandSignature); if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - ConvertHSLToRGB(hue,saturation,lightness,&red,&green,&blue); + ConvertHSLTosRGB(hue,saturation,lightness,&red,&green,&blue); wand->pixel.red=(MagickRealType) red; wand->pixel.green=(MagickRealType) green; wand->pixel.blue=(MagickRealType) blue; diff --git a/coders/null.c b/coders/null.c index 96088d18f..afa709661 100644 --- a/coders/null.c +++ b/coders/null.c @@ -130,7 +130,7 @@ static Image *ReadNULLImage(const ImageInfo *image_info, GetPixelInfo(image,&background); background.alpha=(MagickRealType) TransparentAlpha; if (image->colorspace == CMYKColorspace) - ConvertRGBToCMYK(&background); + ConvertsRGBToCMYK(&background); for (y=0; y < (ssize_t) image->rows; y++) { q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); diff --git a/filters/analyze.c b/filters/analyze.c index 81ddd0201..db3b87c55 100644 --- a/filters/analyze.c +++ b/filters/analyze.c @@ -166,7 +166,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc, } for (x=0; x < (ssize_t) image->columns; x++) { - ConvertRGBToHSL(GetPixelRed(image,p),GetPixelGreen(image,p), + ConvertsRGBToHSL(GetPixelRed(image,p),GetPixelGreen(image,p), GetPixelBlue(image,p),&hue,&saturation,&brightness); brightness*=QuantumRange; brightness_sum_x+=brightness; -- 2.40.0