diff --git a/MagickCore/color.c b/MagickCore/color.c
index 84e1ff4..7ac6ce9 100644
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -1004,52 +1004,53 @@
% The format of the ConcatenateColorComponent() method is:
%
% void ConcatenateColorComponent(const PixelInfo *pixel,
-% const ChannelType channel,const ComplianceType compliance,char *tuple)
+% const PixelComponent component,const ComplianceType compliance,
+% char *tuple)
%
% A description of each parameter follows.
%
% o pixel: The pixel.
%
-% channel: The channel.
+% o component: The pixel component.
%
% o compliance: Adhere to this color standard: SVG, X11, or XPM.
%
-% tuple: The color tuple.
+% o tuple: The color tuple.
%
*/
MagickExport void ConcatenateColorComponent(const PixelInfo *pixel,
- const ChannelType channel,const ComplianceType compliance,char *tuple)
+ const PixelComponent component,const ComplianceType compliance,char *tuple)
{
char
- component[MaxTextExtent];
+ text[MaxTextExtent];
MagickRealType
color;
color=0.0;
- switch (channel)
+ switch (component)
{
- case RedChannel:
+ case RedPixelComponent:
{
color=pixel->red;
break;
}
- case GreenChannel:
+ case GreenPixelComponent:
{
color=pixel->green;
break;
}
- case BlueChannel:
+ case BluePixelComponent:
{
color=pixel->blue;
break;
}
- case AlphaChannel:
+ case AlphaPixelComponent:
{
color=pixel->alpha;
break;
}
- case BlackChannel:
+ case BlackPixelComponent:
{
color=pixel->black;
break;
@@ -1061,48 +1062,48 @@
{
if (pixel->depth > 16)
{
- (void) FormatLocaleString(component,MaxTextExtent,"%10lu",
- (unsigned long) ScaleQuantumToLong(ClampToQuantum(color)));
- (void) ConcatenateMagickString(tuple,component,MaxTextExtent);
+ (void) FormatLocaleString(text,MaxTextExtent,"%10lu",(unsigned long)
+ ScaleQuantumToLong(ClampToQuantum(color)));
+ (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
return;
}
if (pixel->depth > 8)
{
- (void) FormatLocaleString(component,MaxTextExtent,"%5d",
+ (void) FormatLocaleString(text,MaxTextExtent,"%5d",
ScaleQuantumToShort(ClampToQuantum(color)));
- (void) ConcatenateMagickString(tuple,component,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
return;
}
- (void) FormatLocaleString(component,MaxTextExtent,"%3d",
+ (void) FormatLocaleString(text,MaxTextExtent,"%3d",
ScaleQuantumToChar(ClampToQuantum(color)));
- (void) ConcatenateMagickString(tuple,component,MaxTextExtent);
+ (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
return;
}
- if (channel == AlphaChannel)
+ if (component == AlphaPixelComponent)
{
- (void) FormatLocaleString(component,MaxTextExtent,"%g",
- (double) (QuantumScale*color));
- (void) ConcatenateMagickString(tuple,component,MaxTextExtent);
+ (void) FormatLocaleString(text,MaxTextExtent,"%g",(double)
+ (QuantumScale*color));
+ (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
return;
}
if ((pixel->colorspace == HSLColorspace) ||
(pixel->colorspace == HSBColorspace))
{
- (void) FormatLocaleString(component,MaxTextExtent,"%g%%",
- (double) (100.0*QuantumScale*color));
- (void) ConcatenateMagickString(tuple,component,MaxTextExtent);
+ (void) FormatLocaleString(text,MaxTextExtent,"%g%%",(double)
+ (100.0*QuantumScale*color));
+ (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
return;
}
if (pixel->depth > 8)
{
- (void) FormatLocaleString(component,MaxTextExtent,"%g%%",
- (double) (100.0*QuantumScale*color));
- (void) ConcatenateMagickString(tuple,component,MaxTextExtent);
+ (void) FormatLocaleString(text,MaxTextExtent,"%g%%",(double)
+ (100.0*QuantumScale*color));
+ (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
return;
}
- (void) FormatLocaleString(component,MaxTextExtent,"%d",
- ScaleQuantumToChar(ClampToQuantum(color)));
- (void) ConcatenateMagickString(tuple,component,MaxTextExtent);
+ (void) FormatLocaleString(text,MaxTextExtent,"%d",ScaleQuantumToChar(
+ ClampToQuantum(color)));
+ (void) ConcatenateMagickString(tuple,text,MaxTextExtent);
}
/*
@@ -1445,20 +1446,20 @@
if (color.matte != MagickFalse)
(void) ConcatenateMagickString(tuple,"a",MaxTextExtent);
(void) ConcatenateMagickString(tuple,"(",MaxTextExtent);
- ConcatenateColorComponent(&color,RedChannel,SVGCompliance,tuple);
+ ConcatenateColorComponent(&color,RedPixelComponent,SVGCompliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&color,GreenChannel,SVGCompliance,tuple);
+ ConcatenateColorComponent(&color,GreenPixelComponent,SVGCompliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&color,BlueChannel,SVGCompliance,tuple);
+ ConcatenateColorComponent(&color,BluePixelComponent,SVGCompliance,tuple);
if (color.colorspace == CMYKColorspace)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&color,BlackChannel,SVGCompliance,tuple);
+ ConcatenateColorComponent(&color,BlackPixelComponent,SVGCompliance,tuple);
}
if (color.matte != MagickFalse)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&color,AlphaChannel,SVGCompliance,tuple);
+ ConcatenateColorComponent(&color,AlphaPixelComponent,SVGCompliance,tuple);
}
(void) ConcatenateMagickString(tuple,")",MaxTextExtent);
LocaleLower(tuple);
diff --git a/MagickCore/color.h b/MagickCore/color.h
index b6bcafe..e65dae0 100644
--- a/MagickCore/color.h
+++ b/MagickCore/color.h
@@ -89,7 +89,7 @@
extern MagickExport void
ColorComponentTerminus(void),
- ConcatenateColorComponent(const PixelInfo *,const ChannelType,
+ ConcatenateColorComponent(const PixelInfo *,const PixelComponent,
const ComplianceType,char *),
GetColorTuple(const PixelInfo *,const MagickBooleanType,char *);
diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c
index 1d2e5bc..fb99cbc 100644
--- a/MagickCore/histogram.c
+++ b/MagickCore/histogram.c
@@ -1160,20 +1160,22 @@
{
SetPixelInfoPacket(image,p,&pixel);
(void) CopyMagickString(tuple,"(",MaxTextExtent);
- ConcatenateColorComponent(&pixel,RedChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,RedPixelComponent,X11Compliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,GreenChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,GreenPixelComponent,X11Compliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,BlueChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,BluePixelComponent,X11Compliance,tuple);
if (pixel.colorspace == CMYKColorspace)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,BlackChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,BlackPixelComponent,X11Compliance,
+ tuple);
}
if (pixel.matte != MagickFalse)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,OpacityChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,AlphaPixelComponent,X11Compliance,
+ tuple);
}
(void) ConcatenateMagickString(tuple,")",MaxTextExtent);
(void) QueryMagickColorname(image,&pixel,SVGCompliance,color,exception);
diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 6aa59e1..b5ebad6 100644
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -646,22 +646,25 @@
{
SetPixelInfoPacket(image,p,&pixel);
(void) CopyMagickString(tuple,"(",MaxTextExtent);
- ConcatenateColorComponent(&pixel,RedChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,RedPixelComponent,X11Compliance,
+ tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,GreenChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,GreenPixelComponent,X11Compliance,
+ tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,BlueChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,BluePixelComponent,X11Compliance,
+ tuple);
if (pixel.colorspace == CMYKColorspace)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,BlackChannel,X11Compliance,
- tuple);
+ ConcatenateColorComponent(&pixel,BlackPixelComponent,
+ X11Compliance,tuple);
}
if (pixel.matte != MagickFalse)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,AlphaChannel,X11Compliance,
- tuple);
+ ConcatenateColorComponent(&pixel,AlphaPixelComponent,
+ X11Compliance,tuple);
}
(void) ConcatenateMagickString(tuple,")",MaxTextExtent);
(void) QueryMagickColorname(image,&pixel,SVGCompliance,color,
diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 6fe293c..7be7859 100644
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -7481,20 +7481,20 @@
(void) FormatLocaleString(tuple,MaxTextExtent,"%d,%d: ",
windows->magnify.x,windows->magnify.y);
(void) ConcatenateMagickString(tuple,"(",MaxTextExtent);
- ConcatenateColorComponent(&pixel,RedChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,RedPixelComponent,X11Compliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,GreenChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,GreenPixelComponent,X11Compliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,BlueChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,BluePixelComponent,X11Compliance,tuple);
if (pixel.colorspace == CMYKColorspace)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,BlackChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,BlackPixelComponent,X11Compliance,tuple);
}
if (pixel.matte != MagickFalse)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,OpacityChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,AlphaPixelComponent,X11Compliance,tuple);
}
(void) ConcatenateMagickString(tuple,")",MaxTextExtent);
height=(unsigned int) windows->magnify.font_info->ascent+