diff --git a/magick/annotate.c b/magick/annotate.c
index 8933e44..3c355fc 100644
--- a/magick/annotate.c
+++ b/magick/annotate.c
@@ -1791,12 +1791,12 @@
for (x=0; x < (ssize_t) annotate_image->columns; x++)
{
(void) GetFillColor(draw_info,x,y,&fill_color);
- SetAlphaPixelComponent(q,ClampToQuantum((((QuantumRange-
+ SetPixelAlpha(q,ClampToQuantum((((QuantumRange-
(MagickRealType) PixelIntensityToQuantum(q))*(QuantumRange-
fill_color.opacity))/QuantumRange)));
- SetRedPixelComponent(q,fill_color.red);
- SetGreenPixelComponent(q,fill_color.green);
- SetBluePixelComponent(q,fill_color.blue);
+ SetPixelRed(q,fill_color.red);
+ SetPixelGreen(q,fill_color.green);
+ SetPixelBlue(q,fill_color.blue);
q++;
}
sync=SyncCacheViewAuthenticPixels(annotate_view,exception);
diff --git a/magick/attribute.c b/magick/attribute.c
index c4fee6a..f58c794 100644
--- a/magick/attribute.c
+++ b/magick/attribute.c
@@ -344,13 +344,13 @@
status=0;
range=GetQuantumRange(current_depth[id]);
if ((channel & RedChannel) != 0)
- status|=GetRedPixelComponent(p) != ScaleAnyToQuantum(ScaleQuantumToAny(GetRedPixelComponent(p),
+ status|=GetPixelRed(p) != ScaleAnyToQuantum(ScaleQuantumToAny(GetPixelRed(p),
range),range);
if ((channel & GreenChannel) != 0)
- status|=GetGreenPixelComponent(p) != ScaleAnyToQuantum(ScaleQuantumToAny(GetGreenPixelComponent(p),
+ status|=GetPixelGreen(p) != ScaleAnyToQuantum(ScaleQuantumToAny(GetPixelGreen(p),
range),range);
if ((channel & BlueChannel) != 0)
- status|=GetBluePixelComponent(p) != ScaleAnyToQuantum(ScaleQuantumToAny(GetBluePixelComponent(p),
+ status|=GetPixelBlue(p) != ScaleAnyToQuantum(ScaleQuantumToAny(GetPixelBlue(p),
range),range);
if (status == 0)
break;
@@ -402,21 +402,21 @@
status=0;
range=GetQuantumRange(current_depth[id]);
if ((channel & RedChannel) != 0)
- status|=GetRedPixelComponent(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetRedPixelComponent(p),range),range);
+ status|=GetPixelRed(p) != ScaleAnyToQuantum(
+ ScaleQuantumToAny(GetPixelRed(p),range),range);
if ((channel & GreenChannel) != 0)
- status|=GetGreenPixelComponent(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetGreenPixelComponent(p),range),range);
+ status|=GetPixelGreen(p) != ScaleAnyToQuantum(
+ ScaleQuantumToAny(GetPixelGreen(p),range),range);
if ((channel & BlueChannel) != 0)
- status|=GetBluePixelComponent(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetBluePixelComponent(p),range),range);
+ status|=GetPixelBlue(p) != ScaleAnyToQuantum(
+ ScaleQuantumToAny(GetPixelBlue(p),range),range);
if (((channel & OpacityChannel) != 0) && (image->matte != MagickFalse))
- status|=GetOpacityPixelComponent(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetOpacityPixelComponent(p),range),range);
+ status|=GetPixelOpacity(p) != ScaleAnyToQuantum(
+ ScaleQuantumToAny(GetPixelOpacity(p),range),range);
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- status|=GetIndexPixelComponent(indexes+x) !=
- ScaleAnyToQuantum(ScaleQuantumToAny(GetIndexPixelComponent(indexes+
+ status|=GetPixelIndex(indexes+x) !=
+ ScaleAnyToQuantum(ScaleQuantumToAny(GetPixelIndex(indexes+
x),range),range);
if (status == 0)
break;
@@ -778,7 +778,7 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetOpacityPixelComponent(p) != OpaqueOpacity)
+ if (GetPixelOpacity(p) != OpaqueOpacity)
break;
p++;
}
@@ -885,21 +885,21 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ScaleAnyToQuantum(ScaleQuantumToAny(
- GetRedPixelComponent(q),range),range));
+ SetPixelRed(q,ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelRed(q),range),range));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ScaleAnyToQuantum(ScaleQuantumToAny(
- GetGreenPixelComponent(q),range),range));
+ SetPixelGreen(q,ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelGreen(q),range),range));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ScaleAnyToQuantum(ScaleQuantumToAny(
- GetBluePixelComponent(q),range),range));
+ SetPixelBlue(q,ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelBlue(q),range),range));
if (((channel & OpacityChannel) != 0) && (image->matte != MagickFalse))
- SetOpacityPixelComponent(q,ScaleAnyToQuantum(ScaleQuantumToAny(
- GetOpacityPixelComponent(q),range),range));
+ SetPixelOpacity(q,ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelOpacity(q),range),range));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(indexes+x,ScaleAnyToQuantum(ScaleQuantumToAny(
- GetIndexPixelComponent(indexes+x),range),range));
+ SetPixelIndex(indexes+x,ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelIndex(indexes+x),range),range));
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
diff --git a/magick/cache.c b/magick/cache.c
index f44526c..7bdb875 100644
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -460,12 +460,12 @@
break;
if (PixelIntensityToQuantum(r) > ((Quantum) QuantumRange/2))
{
- SetRedPixelComponent(q,GetRedPixelComponent(p));
- SetGreenPixelComponent(q,GetGreenPixelComponent(p));
- SetBluePixelComponent(q,GetBluePixelComponent(p));
- SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+ SetPixelRed(q,GetPixelRed(p));
+ SetPixelGreen(q,GetPixelGreen(p));
+ SetPixelBlue(q,GetPixelBlue(p));
+ SetPixelOpacity(q,GetPixelOpacity(p));
if (cache_info->active_index_channel != MagickFalse)
- SetIndexPixelComponent(nexus_indexes+i,GetIndexPixelComponent(
+ SetPixelIndex(nexus_indexes+i,GetPixelIndex(
indexes+i));
}
p++;
@@ -2202,7 +2202,6 @@
(GetOneAuthenticPixelFromHandler) NULL)
return(cache_info->methods.get_one_authentic_pixel_from_handler(image,x,y,
pixel,exception));
- *pixel=image->background_color;
pixels=GetAuthenticPixelsCache(image,x,y,1UL,1UL,exception);
if (pixels == (PixelPacket *) NULL)
return(MagickFalse);
@@ -3314,35 +3313,35 @@
{
case BlackVirtualPixelMethod:
{
- SetRedPixelComponent(&virtual_pixel,0);
- SetGreenPixelComponent(&virtual_pixel,0);
- SetBluePixelComponent(&virtual_pixel,0);
- SetOpacityPixelComponent(&virtual_pixel,OpaqueOpacity);
+ SetPixelRed(&virtual_pixel,0);
+ SetPixelGreen(&virtual_pixel,0);
+ SetPixelBlue(&virtual_pixel,0);
+ SetPixelOpacity(&virtual_pixel,OpaqueOpacity);
break;
}
case GrayVirtualPixelMethod:
{
- SetRedPixelComponent(&virtual_pixel,QuantumRange/2);
- SetGreenPixelComponent(&virtual_pixel,QuantumRange/2);
- SetBluePixelComponent(&virtual_pixel,QuantumRange/2);
- SetOpacityPixelComponent(&virtual_pixel,OpaqueOpacity);
+ SetPixelRed(&virtual_pixel,QuantumRange/2);
+ SetPixelGreen(&virtual_pixel,QuantumRange/2);
+ SetPixelBlue(&virtual_pixel,QuantumRange/2);
+ SetPixelOpacity(&virtual_pixel,OpaqueOpacity);
break;
}
case TransparentVirtualPixelMethod:
{
- SetRedPixelComponent(&virtual_pixel,0);
- SetGreenPixelComponent(&virtual_pixel,0);
- SetBluePixelComponent(&virtual_pixel,0);
- SetOpacityPixelComponent(&virtual_pixel,TransparentOpacity);
+ SetPixelRed(&virtual_pixel,0);
+ SetPixelGreen(&virtual_pixel,0);
+ SetPixelBlue(&virtual_pixel,0);
+ SetPixelOpacity(&virtual_pixel,TransparentOpacity);
break;
}
case MaskVirtualPixelMethod:
case WhiteVirtualPixelMethod:
{
- SetRedPixelComponent(&virtual_pixel,QuantumRange);
- SetGreenPixelComponent(&virtual_pixel,QuantumRange);
- SetBluePixelComponent(&virtual_pixel,QuantumRange);
- SetOpacityPixelComponent(&virtual_pixel,OpaqueOpacity);
+ SetPixelRed(&virtual_pixel,QuantumRange);
+ SetPixelGreen(&virtual_pixel,QuantumRange);
+ SetPixelBlue(&virtual_pixel,QuantumRange);
+ SetPixelOpacity(&virtual_pixel,OpaqueOpacity);
break;
}
default:
@@ -3912,12 +3911,12 @@
SetMagickPixelPacket(image,q,nexus_indexes+i,&beta);
MagickPixelCompositeMask(&beta,(MagickRealType) PixelIntensityToQuantum(r),
&alpha,alpha.opacity,&beta);
- SetRedPixelComponent(q,ClampToQuantum(beta.red));
- SetGreenPixelComponent(q,ClampToQuantum(beta.green));
- SetBluePixelComponent(q,ClampToQuantum(beta.blue));
- SetOpacityPixelComponent(q,ClampToQuantum(beta.opacity));
+ SetPixelRed(q,ClampToQuantum(beta.red));
+ SetPixelGreen(q,ClampToQuantum(beta.green));
+ SetPixelBlue(q,ClampToQuantum(beta.blue));
+ SetPixelOpacity(q,ClampToQuantum(beta.opacity));
if (cache_info->active_index_channel != MagickFalse)
- SetIndexPixelComponent(nexus_indexes+i,GetIndexPixelComponent(indexes+i));
+ SetPixelIndex(nexus_indexes+i,GetPixelIndex(indexes+i));
p++;
q++;
r++;
diff --git a/magick/color-private.h b/magick/color-private.h
index 93b7292..77482ae 100644
--- a/magick/color-private.h
+++ b/magick/color-private.h
@@ -29,17 +29,17 @@
static inline MagickBooleanType IsColorEqual(const PixelPacket *p,
const PixelPacket *q)
{
- if ((GetRedPixelComponent(p) == GetRedPixelComponent(q)) &&
- (GetGreenPixelComponent(p) == GetGreenPixelComponent(q)) &&
- (GetBluePixelComponent(p) == GetBluePixelComponent(q)))
+ if ((GetPixelRed(p) == GetPixelRed(q)) &&
+ (GetPixelGreen(p) == GetPixelGreen(q)) &&
+ (GetPixelBlue(p) == GetPixelBlue(q)))
return(MagickTrue);
return(MagickFalse);
}
static inline MagickBooleanType IsGray(const PixelPacket *pixel)
{
- if ((GetRedPixelComponent(pixel) == GetGreenPixelComponent(pixel)) &&
- (GetGreenPixelComponent(pixel) == GetBluePixelComponent(pixel)))
+ if ((GetPixelRed(pixel) == GetPixelGreen(pixel)) &&
+ (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
return(MagickTrue);
return(MagickFalse);
}
@@ -135,34 +135,34 @@
MagickRealType
intensity;
- if ((GetRedPixelComponent(pixel) == GetGreenPixelComponent(pixel)) &&
- (GetGreenPixelComponent(pixel) == GetBluePixelComponent(pixel)))
+ if ((GetPixelRed(pixel) == GetPixelGreen(pixel)) &&
+ (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
return((MagickRealType) pixel->red);
- intensity=(MagickRealType) (0.299*GetRedPixelComponent(pixel)+0.587*
- GetGreenPixelComponent(pixel)+0.114*GetBluePixelComponent(pixel));
+ intensity=(MagickRealType) (0.299*GetPixelRed(pixel)+0.587*
+ GetPixelGreen(pixel)+0.114*GetPixelBlue(pixel));
return(intensity);
}
static inline Quantum PixelIntensityToQuantum(const PixelPacket *pixel)
{
#if !defined(MAGICKCORE_HDRI_SUPPORT)
- if ((GetRedPixelComponent(pixel) == GetGreenPixelComponent(pixel)) &&
- (GetGreenPixelComponent(pixel) == GetBluePixelComponent(pixel)))
- return(GetRedPixelComponent(pixel));
- return((Quantum) (0.299*GetRedPixelComponent(pixel)+0.587*
- GetGreenPixelComponent(pixel)+0.114*GetBluePixelComponent(pixel)+0.5));
+ if ((GetPixelRed(pixel) == GetPixelGreen(pixel)) &&
+ (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
+ return(GetPixelRed(pixel));
+ return((Quantum) (0.299*GetPixelRed(pixel)+0.587*
+ GetPixelGreen(pixel)+0.114*GetPixelBlue(pixel)+0.5));
#else
{
double
alpha,
beta;
- alpha=GetRedPixelComponent(pixel)-GetGreenPixelComponent(pixel);
- beta=GetGreenPixelComponent(pixel)-GetBluePixelComponent(pixel);
+ alpha=GetPixelRed(pixel)-GetPixelGreen(pixel);
+ beta=GetPixelGreen(pixel)-GetPixelBlue(pixel);
if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
- return(GetRedPixelComponent(pixel));
- return((Quantum) (0.299*GetRedPixelComponent(pixel)+0.587*
- GetGreenPixelComponent(pixel)+0.114*GetBluePixelComponent(pixel)));
+ return(GetPixelRed(pixel));
+ return((Quantum) (0.299*GetPixelRed(pixel)+0.587*
+ GetPixelGreen(pixel)+0.114*GetPixelBlue(pixel)));
}
#endif
}
diff --git a/magick/color.c b/magick/color.c
index 0ea6572..ee02edb 100644
--- a/magick/color.c
+++ b/magick/color.c
@@ -1564,7 +1564,7 @@
/*
Transparencies are involved - set alpha distance
*/
- pixel=(MagickRealType) ((image->matte != MagickFalse ? GetOpacityPixelComponent(p) :
+ pixel=(MagickRealType) ((image->matte != MagickFalse ? GetPixelOpacity(p) :
OpaqueOpacity)-(image->matte != MagickFalse ? q->opacity :
OpaqueOpacity));
distance=pixel*pixel;
@@ -1574,8 +1574,8 @@
Generate a alpha scaling factor to generate a 4D cone on colorspace
Note that if one color is transparent, distance has no color component.
*/
- scale=(QuantumScale*GetAlphaPixelComponent(p));
- scale*=(QuantumScale*GetAlphaPixelComponent(q));
+ scale=(QuantumScale*GetPixelAlpha(p));
+ scale*=(QuantumScale*GetPixelAlpha(q));
if (scale <= MagickEpsilon)
return(MagickTrue);
}
@@ -1584,7 +1584,7 @@
*/
distance*=3.0; /* rescale appropriately */
fuzz*=3.0;
- pixel=(MagickRealType) GetRedPixelComponent(p)-GetRedPixelComponent(q);
+ pixel=(MagickRealType) GetPixelRed(p)-GetPixelRed(q);
if ((image->colorspace == HSLColorspace) ||
(image->colorspace == HSBColorspace) ||
(image->colorspace == HWBColorspace))
@@ -1600,11 +1600,11 @@
distance+=scale*pixel*pixel;
if (distance > fuzz)
return(MagickFalse);
- pixel=(MagickRealType) GetGreenPixelComponent(p)-q->green;
+ pixel=(MagickRealType) GetPixelGreen(p)-q->green;
distance+=scale*pixel*pixel;
if (distance > fuzz)
return(MagickFalse);
- pixel=(MagickRealType) GetBluePixelComponent(p)-q->blue;
+ pixel=(MagickRealType) GetPixelBlue(p)-q->blue;
distance+=scale*pixel*pixel;
if (distance > fuzz)
return(MagickFalse);
@@ -1810,7 +1810,7 @@
/*
Transparencies are involved - set alpha distance.
*/
- pixel=(p->matte != MagickFalse ? GetOpacityPixelComponent(p) :
+ pixel=(p->matte != MagickFalse ? GetPixelOpacity(p) :
OpaqueOpacity)-(q->matte != MagickFalse ? q->opacity : OpaqueOpacity);
distance=pixel*pixel;
if (distance > fuzz)
@@ -1820,9 +1820,9 @@
Note that if one color is transparent, distance has no color component
*/
if (p->matte != MagickFalse)
- scale=(QuantumScale*GetAlphaPixelComponent(p));
+ scale=(QuantumScale*GetPixelAlpha(p));
if (q->matte != MagickFalse)
- scale*=(QuantumScale*GetAlphaPixelComponent(q));
+ scale*=(QuantumScale*GetPixelAlpha(q));
if ( scale <= MagickEpsilon )
return(MagickTrue);
}
@@ -1859,11 +1859,11 @@
distance+=pixel*pixel*scale;
if (distance > fuzz)
return(MagickFalse);
- pixel=GetGreenPixelComponent(p)-q->green;
+ pixel=GetPixelGreen(p)-q->green;
distance+=pixel*pixel*scale;
if (distance > fuzz)
return(MagickFalse);
- pixel=GetBluePixelComponent(p)-q->blue;
+ pixel=GetPixelBlue(p)-q->blue;
distance+=pixel*pixel*scale;
if (distance > fuzz)
return(MagickFalse);
@@ -1912,10 +1912,10 @@
if (image->matte == MagickFalse)
return(MagickTrue);
- if (GetOpacityPixelComponent(p) == q->opacity)
+ if (GetPixelOpacity(p) == q->opacity)
return(MagickTrue);
fuzz=MagickMax(image->fuzz,MagickSQ1_2)*MagickMax(image->fuzz,MagickSQ1_2);
- pixel=(MagickRealType) GetOpacityPixelComponent(p)-(MagickRealType) q->opacity;
+ pixel=(MagickRealType) GetPixelOpacity(p)-(MagickRealType) q->opacity;
distance=pixel*pixel;
if (distance > fuzz)
return(MagickFalse);
@@ -2304,11 +2304,11 @@
color_info->name=(char *) p->name;
GetMagickPixelPacket((Image *) NULL,&color_info->color);
color_info->color.red=(MagickRealType) ScaleCharToQuantum(
- GetRedPixelComponent(p));
+ GetPixelRed(p));
color_info->color.green=(MagickRealType) ScaleCharToQuantum(
- GetGreenPixelComponent(p));
+ GetPixelGreen(p));
color_info->color.blue=(MagickRealType) ScaleCharToQuantum(
- GetBluePixelComponent(p));
+ GetPixelBlue(p));
color_info->color.opacity=(MagickRealType) (QuantumRange-QuantumRange*
p->alpha);
color_info->compliance=(ComplianceType) p->compliance;
@@ -2384,23 +2384,23 @@
pixel;
status=QueryMagickColorCompliance(name,compliance,&pixel,exception);
- SetOpacityPixelComponent(color,ClampToQuantum(pixel.opacity));
+ SetPixelOpacity(color,ClampToQuantum(pixel.opacity));
if (pixel.colorspace == CMYKColorspace)
{
- SetRedPixelComponent(color,ClampToQuantum((MagickRealType)
+ SetPixelRed(color,ClampToQuantum((MagickRealType)
(QuantumRange-MagickMin(QuantumRange,(MagickRealType) (QuantumScale*
pixel.red*(QuantumRange-pixel.index)+pixel.index)))));
- SetGreenPixelComponent(color,ClampToQuantum((MagickRealType)
+ SetPixelGreen(color,ClampToQuantum((MagickRealType)
(QuantumRange-MagickMin(QuantumRange,(MagickRealType) (QuantumScale*
pixel.green*(QuantumRange-pixel.index)+pixel.index)))));
- SetBluePixelComponent(color,ClampToQuantum((MagickRealType)
+ SetPixelBlue(color,ClampToQuantum((MagickRealType)
(QuantumRange-MagickMin(QuantumRange,(MagickRealType) (QuantumScale*
pixel.blue*(QuantumRange-pixel.index)+pixel.index)))));
return(status);
}
- SetRedPixelComponent(color,ClampToQuantum(pixel.red));
- SetGreenPixelComponent(color,ClampToQuantum(pixel.green));
- SetBluePixelComponent(color,ClampToQuantum(pixel.blue));
+ SetPixelRed(color,ClampToQuantum(pixel.red));
+ SetPixelGreen(color,ClampToQuantum(pixel.green));
+ SetPixelBlue(color,ClampToQuantum(pixel.blue));
return(status);
}
diff --git a/magick/colormap.c b/magick/colormap.c
index 26adf3b..bc24068 100644
--- a/magick/colormap.c
+++ b/magick/colormap.c
@@ -232,12 +232,12 @@
indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- index=(ssize_t) (GetIndexPixelComponent(indexes+x)+displace) %
+ index=(ssize_t) (GetPixelIndex(indexes+x)+displace) %
image->colors;
if (index < 0)
index+=(ssize_t) image->colors;
- SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+ SetPixelIndex(indexes+x,index);
+ SetPixelRGBO(q,image->colormap+(ssize_t) index);
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -376,9 +376,9 @@
indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- index=(IndexPacket) pixels[(ssize_t) GetIndexPixelComponent(indexes+x)];
- SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+ index=(IndexPacket) pixels[(ssize_t) GetPixelIndex(indexes+x)];
+ SetPixelIndex(indexes+x,index);
+ SetPixelRGBO(q,image->colormap+(ssize_t) index);
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
diff --git a/magick/colorspace.c b/magick/colorspace.c
index e99fc56..730717c 100644
--- a/magick/colorspace.c
+++ b/magick/colorspace.c
@@ -269,12 +269,12 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
- (QuantumRange-GetRedPixelComponent(q))));
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
- (QuantumRange-GetGreenPixelComponent(q))));
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
- (QuantumRange-GetBluePixelComponent(q))));
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
+ (QuantumRange-GetPixelRed(q))));
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
+ (QuantumRange-GetPixelGreen(q))));
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
+ (QuantumRange-GetPixelBlue(q))));
q++;
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -390,13 +390,13 @@
brightness=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
- ConvertRGBToHSB(GetRedPixelComponent(q),GetGreenPixelComponent(q),
- GetBluePixelComponent(q),&hue,&saturation,&brightness);
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ ConvertRGBToHSB(GetPixelRed(q),GetPixelGreen(q),
+ GetPixelBlue(q),&hue,&saturation,&brightness);
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*hue));
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*saturation));
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*brightness));
q++;
}
@@ -450,13 +450,13 @@
lightness=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
- ConvertRGBToHSL(GetRedPixelComponent(q),GetGreenPixelComponent(q),
- GetBluePixelComponent(q),&hue,&saturation,&lightness);
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ ConvertRGBToHSL(GetPixelRed(q),GetPixelGreen(q),
+ GetPixelBlue(q),&hue,&saturation,&lightness);
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*hue));
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*saturation));
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*lightness));
q++;
}
@@ -510,13 +510,13 @@
blackness=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
- ConvertRGBToHWB(GetRedPixelComponent(q),GetGreenPixelComponent(q),
- GetBluePixelComponent(q),&hue,&whiteness,&blackness);
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ ConvertRGBToHWB(GetPixelRed(q),GetPixelGreen(q),
+ GetPixelBlue(q),&hue,&whiteness,&blackness);
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*hue));
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*whiteness));
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*blackness));
q++;
}
@@ -576,14 +576,14 @@
Z=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
- ConvertRGBToXYZ(GetRedPixelComponent(q),GetGreenPixelComponent(q),
- GetBluePixelComponent(q),&X,&Y,&Z);
+ ConvertRGBToXYZ(GetPixelRed(q),GetPixelGreen(q),
+ GetPixelBlue(q),&X,&Y,&Z);
ConvertXYZToLab(X,Y,Z,&L,&a,&b);
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*L));
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*a));
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*b));
q++;
}
@@ -673,12 +673,12 @@
}
for (x=(ssize_t) image->columns; x != 0; x--)
{
- SetRedPixelComponent(q,logmap[ScaleQuantumToMap(
- GetRedPixelComponent(q))]);
- SetGreenPixelComponent(q,logmap[ScaleQuantumToMap(
- GetGreenPixelComponent(q))]);
- SetBluePixelComponent(q,logmap[ScaleQuantumToMap(
- GetBluePixelComponent(q))]);
+ SetPixelRed(q,logmap[ScaleQuantumToMap(
+ GetPixelRed(q))]);
+ SetPixelGreen(q,logmap[ScaleQuantumToMap(
+ GetPixelGreen(q))]);
+ SetPixelBlue(q,logmap[ScaleQuantumToMap(
+ GetPixelBlue(q))]);
q++;
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1089,18 +1089,18 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- red=ScaleQuantumToMap(GetRedPixelComponent(q));
- green=ScaleQuantumToMap(GetGreenPixelComponent(q));
- blue=ScaleQuantumToMap(GetBluePixelComponent(q));
+ red=ScaleQuantumToMap(GetPixelRed(q));
+ green=ScaleQuantumToMap(GetPixelGreen(q));
+ blue=ScaleQuantumToMap(GetPixelBlue(q));
pixel.red=(x_map[red].x+y_map[green].x+z_map[blue].x)+
(MagickRealType) primary_info.x;
pixel.green=(x_map[red].y+y_map[green].y+z_map[blue].y)+
(MagickRealType) primary_info.y;
pixel.blue=(x_map[red].z+y_map[green].z+z_map[blue].z)+
(MagickRealType) primary_info.z;
- SetRedPixelComponent(q,ScaleMapToQuantum(pixel.red));
- SetGreenPixelComponent(q,ScaleMapToQuantum(pixel.green));
- SetBluePixelComponent(q,ScaleMapToQuantum(pixel.blue));
+ SetPixelRed(q,ScaleMapToQuantum(pixel.red));
+ SetPixelGreen(q,ScaleMapToQuantum(pixel.green));
+ SetPixelBlue(q,ScaleMapToQuantum(pixel.blue));
q++;
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1701,12 +1701,12 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
- (QuantumRange-GetRedPixelComponent(q))));
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
- (QuantumRange-GetGreenPixelComponent(q))));
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
- (QuantumRange-GetBluePixelComponent(q))));
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
+ (QuantumRange-GetPixelRed(q))));
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
+ (QuantumRange-GetPixelGreen(q))));
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
+ (QuantumRange-GetPixelBlue(q))));
q++;
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1830,13 +1830,13 @@
green,
red;
- hue=(double) (QuantumScale*GetRedPixelComponent(q));
- saturation=(double) (QuantumScale*GetGreenPixelComponent(q));
- brightness=(double) (QuantumScale*GetBluePixelComponent(q));
+ hue=(double) (QuantumScale*GetPixelRed(q));
+ saturation=(double) (QuantumScale*GetPixelGreen(q));
+ brightness=(double) (QuantumScale*GetPixelBlue(q));
ConvertHSBToRGB(hue,saturation,brightness,&red,&green,&blue);
- SetRedPixelComponent(q,red);
- SetGreenPixelComponent(q,green);
- SetBluePixelComponent(q,blue);
+ SetPixelRed(q,red);
+ SetPixelGreen(q,green);
+ SetPixelBlue(q,blue);
q++;
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1896,13 +1896,13 @@
green,
red;
- hue=(double) (QuantumScale*GetRedPixelComponent(q));
- saturation=(double) (QuantumScale*GetGreenPixelComponent(q));
- lightness=(double) (QuantumScale*GetBluePixelComponent(q));
+ hue=(double) (QuantumScale*GetPixelRed(q));
+ saturation=(double) (QuantumScale*GetPixelGreen(q));
+ lightness=(double) (QuantumScale*GetPixelBlue(q));
ConvertHSLToRGB(hue,saturation,lightness,&red,&green,&blue);
- SetRedPixelComponent(q,red);
- SetGreenPixelComponent(q,green);
- SetBluePixelComponent(q,blue);
+ SetPixelRed(q,red);
+ SetPixelGreen(q,green);
+ SetPixelBlue(q,blue);
q++;
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1962,13 +1962,13 @@
green,
red;
- hue=(double) (QuantumScale*GetRedPixelComponent(q));
- whiteness=(double) (QuantumScale*GetGreenPixelComponent(q));
- blackness=(double) (QuantumScale*GetBluePixelComponent(q));
+ hue=(double) (QuantumScale*GetPixelRed(q));
+ whiteness=(double) (QuantumScale*GetPixelGreen(q));
+ blackness=(double) (QuantumScale*GetPixelBlue(q));
ConvertHWBToRGB(hue,whiteness,blackness,&red,&green,&blue);
- SetRedPixelComponent(q,red);
- SetGreenPixelComponent(q,green);
- SetBluePixelComponent(q,blue);
+ SetPixelRed(q,red);
+ SetPixelGreen(q,green);
+ SetPixelBlue(q,blue);
q++;
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -2034,14 +2034,14 @@
green,
red;
- L=QuantumScale*GetRedPixelComponent(q);
- a=QuantumScale*GetGreenPixelComponent(q);
- b=QuantumScale*GetBluePixelComponent(q);
+ L=QuantumScale*GetPixelRed(q);
+ a=QuantumScale*GetPixelGreen(q);
+ b=QuantumScale*GetPixelBlue(q);
ConvertLabToXYZ(L,a,b,&X,&Y,&Z);
ConvertXYZToRGB(X,Y,Z,&red,&green,&blue);
- SetRedPixelComponent(q,red);
- SetGreenPixelComponent(q,green);
- SetBluePixelComponent(q,blue);
+ SetPixelRed(q,red);
+ SetPixelGreen(q,green);
+ SetPixelBlue(q,blue);
q++;
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -2133,12 +2133,12 @@
}
for (x=(ssize_t) image->columns; x != 0; x--)
{
- SetRedPixelComponent(q,logmap[ScaleQuantumToMap(
- GetRedPixelComponent(q))]);
- SetGreenPixelComponent(q,logmap[ScaleQuantumToMap(
- GetGreenPixelComponent(q))]);
- SetBluePixelComponent(q,logmap[ScaleQuantumToMap(
- GetBluePixelComponent(q))]);
+ SetPixelRed(q,logmap[ScaleQuantumToMap(
+ GetPixelRed(q))]);
+ SetPixelGreen(q,logmap[ScaleQuantumToMap(
+ GetPixelGreen(q))]);
+ SetPixelBlue(q,logmap[ScaleQuantumToMap(
+ GetPixelBlue(q))]);
q++;
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -2511,9 +2511,9 @@
green,
red;
- red=ScaleQuantumToMap(GetRedPixelComponent(q));
- green=ScaleQuantumToMap(GetGreenPixelComponent(q));
- blue=ScaleQuantumToMap(GetBluePixelComponent(q));
+ red=ScaleQuantumToMap(GetPixelRed(q));
+ green=ScaleQuantumToMap(GetPixelGreen(q));
+ blue=ScaleQuantumToMap(GetPixelBlue(q));
pixel.red=x_map[red].x+y_map[green].x+z_map[blue].x;
pixel.green=x_map[red].y+y_map[green].y+z_map[blue].y;
pixel.blue=x_map[red].z+y_map[green].z+z_map[blue].z;
@@ -2553,11 +2553,11 @@
default:
break;
}
- SetRedPixelComponent(q,ScaleMapToQuantum((MagickRealType) MaxMap*
+ SetPixelRed(q,ScaleMapToQuantum((MagickRealType) MaxMap*
QuantumScale*pixel.red));
- SetGreenPixelComponent(q,ScaleMapToQuantum((MagickRealType) MaxMap*
+ SetPixelGreen(q,ScaleMapToQuantum((MagickRealType) MaxMap*
QuantumScale*pixel.green));
- SetBluePixelComponent(q,ScaleMapToQuantum((MagickRealType) MaxMap*
+ SetPixelBlue(q,ScaleMapToQuantum((MagickRealType) MaxMap*
QuantumScale*pixel.blue));
q++;
}
diff --git a/magick/compare.c b/magick/compare.c
index 586d930..b95185c 100644
--- a/magick/compare.c
+++ b/magick/compare.c
@@ -263,23 +263,23 @@
else
{
if (((channel & RedChannel) != 0) &&
- (GetRedPixelComponent(p) != GetRedPixelComponent(q)))
+ (GetPixelRed(p) != GetPixelRed(q)))
difference=MagickTrue;
if (((channel & GreenChannel) != 0) &&
- (GetGreenPixelComponent(p) != GetGreenPixelComponent(q)))
+ (GetPixelGreen(p) != GetPixelGreen(q)))
difference=MagickTrue;
if (((channel & BlueChannel) != 0) &&
- (GetBluePixelComponent(p) != GetBluePixelComponent(q)))
+ (GetPixelBlue(p) != GetPixelBlue(q)))
difference=MagickTrue;
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse) &&
- (GetOpacityPixelComponent(p) != GetOpacityPixelComponent(q)))
+ (GetPixelOpacity(p) != GetPixelOpacity(q)))
difference=MagickTrue;
if ((((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace)) &&
- (GetIndexPixelComponent(indexes+x) !=
- GetIndexPixelComponent(reconstruct_indexes+x)))
+ (GetPixelIndex(indexes+x) !=
+ GetPixelIndex(reconstruct_indexes+x)))
difference=MagickTrue;
}
if (difference != MagickFalse)
@@ -532,22 +532,22 @@
if ((channel & RedChannel) != 0)
{
- distance=QuantumScale*(GetRedPixelComponent(p)-(MagickRealType)
- GetRedPixelComponent(q));
+ distance=QuantumScale*(GetPixelRed(p)-(MagickRealType)
+ GetPixelRed(q));
channel_distortion[RedChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
if ((channel & GreenChannel) != 0)
{
- distance=QuantumScale*(GetGreenPixelComponent(p)-(MagickRealType)
- GetGreenPixelComponent(q));
+ distance=QuantumScale*(GetPixelGreen(p)-(MagickRealType)
+ GetPixelGreen(q));
channel_distortion[GreenChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
if ((channel & BlueChannel) != 0)
{
- distance=QuantumScale*(GetBluePixelComponent(p)-(MagickRealType)
- GetBluePixelComponent(q));
+ distance=QuantumScale*(GetPixelBlue(p)-(MagickRealType)
+ GetPixelBlue(q));
channel_distortion[BlueChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
@@ -555,9 +555,9 @@
(reconstruct_image->matte != MagickFalse)))
{
distance=QuantumScale*((image->matte != MagickFalse ?
- GetOpacityPixelComponent(p) : OpaqueOpacity)-
+ GetPixelOpacity(p) : OpaqueOpacity)-
(reconstruct_image->matte != MagickFalse ?
- GetOpacityPixelComponent(q): OpaqueOpacity));
+ GetPixelOpacity(q): OpaqueOpacity));
channel_distortion[OpacityChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
@@ -565,8 +565,8 @@
(image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
{
- distance=QuantumScale*(GetIndexPixelComponent(indexes+x)-
- (MagickRealType) GetIndexPixelComponent(reconstruct_indexes+x));
+ distance=QuantumScale*(GetPixelIndex(indexes+x)-
+ (MagickRealType) GetPixelIndex(reconstruct_indexes+x));
channel_distortion[BlackChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
@@ -652,38 +652,38 @@
if ((channel & RedChannel) != 0)
{
- distance=QuantumScale*fabs(GetRedPixelComponent(p)-(double)
- GetRedPixelComponent(q));
+ distance=QuantumScale*fabs(GetPixelRed(p)-(double)
+ GetPixelRed(q));
channel_distortion[RedChannel]+=distance;
channel_distortion[CompositeChannels]+=distance;
}
if ((channel & GreenChannel) != 0)
{
- distance=QuantumScale*fabs(GetGreenPixelComponent(p)-(double)
- GetGreenPixelComponent(q));
+ distance=QuantumScale*fabs(GetPixelGreen(p)-(double)
+ GetPixelGreen(q));
channel_distortion[GreenChannel]+=distance;
channel_distortion[CompositeChannels]+=distance;
}
if ((channel & BlueChannel) != 0)
{
- distance=QuantumScale*fabs(GetBluePixelComponent(p)-(double)
- GetBluePixelComponent(q));
+ distance=QuantumScale*fabs(GetPixelBlue(p)-(double)
+ GetPixelBlue(q));
channel_distortion[BlueChannel]+=distance;
channel_distortion[CompositeChannels]+=distance;
}
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse))
{
- distance=QuantumScale*fabs(GetOpacityPixelComponent(p)-(double)
- GetOpacityPixelComponent(q));
+ distance=QuantumScale*fabs(GetPixelOpacity(p)-(double)
+ GetPixelOpacity(q));
channel_distortion[OpacityChannel]+=distance;
channel_distortion[CompositeChannels]+=distance;
}
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
{
- distance=QuantumScale*fabs(GetIndexPixelComponent(indexes+x)-(double)
- GetIndexPixelComponent(reconstruct_indexes+x));
+ distance=QuantumScale*fabs(GetPixelIndex(indexes+x)-(double)
+ GetPixelIndex(reconstruct_indexes+x));
channel_distortion[BlackChannel]+=distance;
channel_distortion[CompositeChannels]+=distance;
}
@@ -764,14 +764,14 @@
if ((channel & OpacityChannel) != 0)
{
if (image->matte != MagickFalse)
- alpha=(MagickRealType) (QuantumScale*(GetAlphaPixelComponent(p)));
+ alpha=(MagickRealType) (QuantumScale*(GetPixelAlpha(p)));
if (reconstruct_image->matte != MagickFalse)
- beta=(MagickRealType) (QuantumScale*GetAlphaPixelComponent(q));
+ beta=(MagickRealType) (QuantumScale*GetPixelAlpha(q));
}
if ((channel & RedChannel) != 0)
{
- distance=fabs(alpha*GetRedPixelComponent(p)-beta*
- GetRedPixelComponent(q));
+ distance=fabs(alpha*GetPixelRed(p)-beta*
+ GetPixelRed(q));
distortion[RedChannel]+=distance;
distortion[CompositeChannels]+=distance;
mean_error+=distance*distance;
@@ -781,8 +781,8 @@
}
if ((channel & GreenChannel) != 0)
{
- distance=fabs(alpha*GetGreenPixelComponent(p)-beta*
- GetGreenPixelComponent(q));
+ distance=fabs(alpha*GetPixelGreen(p)-beta*
+ GetPixelGreen(q));
distortion[GreenChannel]+=distance;
distortion[CompositeChannels]+=distance;
mean_error+=distance*distance;
@@ -792,8 +792,8 @@
}
if ((channel & BlueChannel) != 0)
{
- distance=fabs(alpha*GetBluePixelComponent(p)-beta*
- GetBluePixelComponent(q));
+ distance=fabs(alpha*GetPixelBlue(p)-beta*
+ GetPixelBlue(q));
distortion[BlueChannel]+=distance;
distortion[CompositeChannels]+=distance;
mean_error+=distance*distance;
@@ -804,8 +804,8 @@
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse))
{
- distance=fabs((double) GetOpacityPixelComponent(p)-
- GetOpacityPixelComponent(q));
+ distance=fabs((double) GetPixelOpacity(p)-
+ GetPixelOpacity(q));
distortion[OpacityChannel]+=distance;
distortion[CompositeChannels]+=distance;
mean_error+=distance*distance;
@@ -817,8 +817,8 @@
(image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
{
- distance=fabs(alpha*GetIndexPixelComponent(indexes+x)-beta*
- GetIndexPixelComponent(reconstruct_indexes+x));
+ distance=fabs(alpha*GetPixelIndex(indexes+x)-beta*
+ GetPixelIndex(reconstruct_indexes+x));
distortion[BlackChannel]+=distance;
distortion[CompositeChannels]+=distance;
mean_error+=distance*distance;
@@ -898,30 +898,30 @@
if ((channel & RedChannel) != 0)
{
- distance=QuantumScale*(GetRedPixelComponent(p)-(MagickRealType)
- GetRedPixelComponent(q));
+ distance=QuantumScale*(GetPixelRed(p)-(MagickRealType)
+ GetPixelRed(q));
channel_distortion[RedChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
if ((channel & GreenChannel) != 0)
{
- distance=QuantumScale*(GetGreenPixelComponent(p)-(MagickRealType)
- GetGreenPixelComponent(q));
+ distance=QuantumScale*(GetPixelGreen(p)-(MagickRealType)
+ GetPixelGreen(q));
channel_distortion[GreenChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
if ((channel & BlueChannel) != 0)
{
- distance=QuantumScale*(GetBluePixelComponent(p)-(MagickRealType)
- GetBluePixelComponent(q));
+ distance=QuantumScale*(GetPixelBlue(p)-(MagickRealType)
+ GetPixelBlue(q));
channel_distortion[BlueChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse))
{
- distance=QuantumScale*(GetOpacityPixelComponent(p)-(MagickRealType)
- GetOpacityPixelComponent(q));
+ distance=QuantumScale*(GetPixelOpacity(p)-(MagickRealType)
+ GetPixelOpacity(q));
channel_distortion[OpacityChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
@@ -929,8 +929,8 @@
(image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
{
- distance=QuantumScale*(GetIndexPixelComponent(indexes+x)-
- (MagickRealType) GetIndexPixelComponent(reconstruct_indexes+x));
+ distance=QuantumScale*(GetPixelIndex(indexes+x)-
+ (MagickRealType) GetPixelIndex(reconstruct_indexes+x));
channel_distortion[BlackChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
@@ -1020,30 +1020,30 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- distortion[RedChannel]+=area*QuantumScale*(GetRedPixelComponent(p)-
- image_statistics[RedChannel].mean)*(GetRedPixelComponent(q)-
+ distortion[RedChannel]+=area*QuantumScale*(GetPixelRed(p)-
+ image_statistics[RedChannel].mean)*(GetPixelRed(q)-
reconstruct_statistics[RedChannel].mean);
if ((channel & GreenChannel) != 0)
- distortion[GreenChannel]+=area*QuantumScale*(GetGreenPixelComponent(p)-
- image_statistics[GreenChannel].mean)*(GetGreenPixelComponent(q)-
+ distortion[GreenChannel]+=area*QuantumScale*(GetPixelGreen(p)-
+ image_statistics[GreenChannel].mean)*(GetPixelGreen(q)-
reconstruct_statistics[GreenChannel].mean);
if ((channel & BlueChannel) != 0)
- distortion[BlueChannel]+=area*QuantumScale*(GetBluePixelComponent(p)-
- image_statistics[BlueChannel].mean)*(GetBluePixelComponent(q)-
+ distortion[BlueChannel]+=area*QuantumScale*(GetPixelBlue(p)-
+ image_statistics[BlueChannel].mean)*(GetPixelBlue(q)-
reconstruct_statistics[BlueChannel].mean);
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse))
distortion[OpacityChannel]+=area*QuantumScale*(
- GetOpacityPixelComponent(p)-image_statistics[OpacityChannel].mean)*
- (GetOpacityPixelComponent(q)-
+ GetPixelOpacity(p)-image_statistics[OpacityChannel].mean)*
+ (GetPixelOpacity(q)-
reconstruct_statistics[OpacityChannel].mean);
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
distortion[BlackChannel]+=area*QuantumScale*(
- GetIndexPixelComponent(indexes+x)-
+ GetPixelIndex(indexes+x)-
image_statistics[OpacityChannel].mean)*(
- GetIndexPixelComponent(reconstruct_indexes+x)-
+ GetPixelIndex(reconstruct_indexes+x)-
reconstruct_statistics[OpacityChannel].mean);
p++;
q++;
@@ -1160,8 +1160,8 @@
if ((channel & RedChannel) != 0)
{
- distance=QuantumScale*fabs(GetRedPixelComponent(p)-(double)
- GetRedPixelComponent(q));
+ distance=QuantumScale*fabs(GetPixelRed(p)-(double)
+ GetPixelRed(q));
if (distance > channel_distortion[RedChannel])
channel_distortion[RedChannel]=distance;
if (distance > channel_distortion[CompositeChannels])
@@ -1169,8 +1169,8 @@
}
if ((channel & GreenChannel) != 0)
{
- distance=QuantumScale*fabs(GetGreenPixelComponent(p)-(double)
- GetGreenPixelComponent(q));
+ distance=QuantumScale*fabs(GetPixelGreen(p)-(double)
+ GetPixelGreen(q));
if (distance > channel_distortion[GreenChannel])
channel_distortion[GreenChannel]=distance;
if (distance > channel_distortion[CompositeChannels])
@@ -1178,8 +1178,8 @@
}
if ((channel & BlueChannel) != 0)
{
- distance=QuantumScale*fabs(GetBluePixelComponent(p)-(double)
- GetBluePixelComponent(q));
+ distance=QuantumScale*fabs(GetPixelBlue(p)-(double)
+ GetPixelBlue(q));
if (distance > channel_distortion[BlueChannel])
channel_distortion[BlueChannel]=distance;
if (distance > channel_distortion[CompositeChannels])
@@ -1188,8 +1188,8 @@
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse))
{
- distance=QuantumScale*fabs(GetOpacityPixelComponent(p)-(double)
- GetOpacityPixelComponent(q));
+ distance=QuantumScale*fabs(GetPixelOpacity(p)-(double)
+ GetPixelOpacity(q));
if (distance > channel_distortion[OpacityChannel])
channel_distortion[OpacityChannel]=distance;
if (distance > channel_distortion[CompositeChannels])
@@ -1199,8 +1199,8 @@
(image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
{
- distance=QuantumScale*fabs(GetIndexPixelComponent(indexes+x)-(double)
- GetIndexPixelComponent(reconstruct_indexes+x));
+ distance=QuantumScale*fabs(GetPixelIndex(indexes+x)-(double)
+ GetPixelIndex(reconstruct_indexes+x));
if (distance > channel_distortion[BlackChannel])
channel_distortion[BlackChannel]=distance;
if (distance > channel_distortion[CompositeChannels])
@@ -1621,22 +1621,22 @@
MagickRealType
distance;
- distance=fabs(GetRedPixelComponent(p)-(double)
- GetRedPixelComponent(q));
+ distance=fabs(GetPixelRed(p)-(double)
+ GetPixelRed(q));
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
if (distance > maximum_error)
maximum_error=distance;
area++;
- distance=fabs(GetGreenPixelComponent(p)-(double)
- GetGreenPixelComponent(q));
+ distance=fabs(GetPixelGreen(p)-(double)
+ GetPixelGreen(q));
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
if (distance > maximum_error)
maximum_error=distance;
area++;
- distance=fabs(GetBluePixelComponent(p)-(double)
- GetBluePixelComponent(q));
+ distance=fabs(GetPixelBlue(p)-(double)
+ GetPixelBlue(q));
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
if (distance > maximum_error)
@@ -1644,8 +1644,8 @@
area++;
if (image->matte != MagickFalse)
{
- distance=fabs(GetOpacityPixelComponent(p)-(double)
- GetOpacityPixelComponent(q));
+ distance=fabs(GetPixelOpacity(p)-(double)
+ GetPixelOpacity(q));
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
if (distance > maximum_error)
@@ -1655,8 +1655,8 @@
if ((image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
{
- distance=fabs(GetIndexPixelComponent(indexes+x)-(double)
- GetIndexPixelComponent(reconstruct_indexes+x));
+ distance=fabs(GetPixelIndex(indexes+x)-(double)
+ GetPixelIndex(reconstruct_indexes+x));
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
if (distance > maximum_error)
@@ -1777,23 +1777,23 @@
reconstruct_indexes=GetCacheViewVirtualIndexQueue(reconstruct_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- distortion+=area*QuantumScale*(GetRedPixelComponent(p)-
- image_statistics[RedChannel].mean)*(GetRedPixelComponent(q)-
+ distortion+=area*QuantumScale*(GetPixelRed(p)-
+ image_statistics[RedChannel].mean)*(GetPixelRed(q)-
reconstruct_statistics[RedChannel].mean);
- distortion+=area*QuantumScale*(GetGreenPixelComponent(p)-
- image_statistics[GreenChannel].mean)*(GetGreenPixelComponent(q)-
+ distortion+=area*QuantumScale*(GetPixelGreen(p)-
+ image_statistics[GreenChannel].mean)*(GetPixelGreen(q)-
reconstruct_statistics[GreenChannel].mean);
- distortion+=area*QuantumScale*(GetBluePixelComponent(p)-
+ distortion+=area*QuantumScale*(GetPixelBlue(p)-
image_statistics[BlueChannel].mean)*(q->blue-
reconstruct_statistics[BlueChannel].mean);
if (image->matte != MagickFalse)
- distortion+=area*QuantumScale*(GetOpacityPixelComponent(p)-
- image_statistics[OpacityChannel].mean)*(GetOpacityPixelComponent(q)-
+ distortion+=area*QuantumScale*(GetPixelOpacity(p)-
+ image_statistics[OpacityChannel].mean)*(GetPixelOpacity(q)-
reconstruct_statistics[OpacityChannel].mean);
if ((image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
- distortion+=area*QuantumScale*(GetIndexPixelComponent(indexes+x)-
- image_statistics[BlackChannel].mean)*(GetIndexPixelComponent(
+ distortion+=area*QuantumScale*(GetPixelIndex(indexes+x)-
+ image_statistics[BlackChannel].mean)*(GetPixelIndex(
reconstruct_indexes+x)-reconstruct_statistics[BlackChannel].mean);
p++;
q++;
@@ -1934,10 +1934,10 @@
offset->x=x;
offset->y=y;
}
- SetRedPixelComponent(q,ClampToQuantum(QuantumRange-QuantumRange*
+ SetPixelRed(q,ClampToQuantum(QuantumRange-QuantumRange*
similarity));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
}
if (SyncCacheViewAuthenticPixels(similarity_view,exception) == MagickFalse)
diff --git a/magick/composite-private.h b/magick/composite-private.h
index 6a4e09a..abe108d 100644
--- a/magick/composite-private.h
+++ b/magick/composite-private.h
@@ -62,27 +62,27 @@
#if !defined(MAGICKCORE_HDRI_SUPPORT)
composite->opacity=(Quantum) (QuantumRange*(1.0-gamma)+0.5);
gamma=1.0/(gamma <= MagickEpsilon ? 1.0 : gamma);
- SetRedPixelComponent(composite,gamma*MagickOver_((MagickRealType)
- GetRedPixelComponent(p),alpha,(MagickRealType)
- GetRedPixelComponent(q),beta)+0.5);
- SetGreenPixelComponent(composite,gamma*MagickOver_((MagickRealType)
- GetGreenPixelComponent(p),alpha,(MagickRealType)
- GetGreenPixelComponent(q),beta)+0.5);
- SetBluePixelComponent(composite,gamma*MagickOver_((MagickRealType)
- GetBluePixelComponent(p),alpha,(MagickRealType)
- GetBluePixelComponent(q),beta)+0.5);
+ SetPixelRed(composite,gamma*MagickOver_((MagickRealType)
+ GetPixelRed(p),alpha,(MagickRealType)
+ GetPixelRed(q),beta)+0.5);
+ SetPixelGreen(composite,gamma*MagickOver_((MagickRealType)
+ GetPixelGreen(p),alpha,(MagickRealType)
+ GetPixelGreen(q),beta)+0.5);
+ SetPixelBlue(composite,gamma*MagickOver_((MagickRealType)
+ GetPixelBlue(p),alpha,(MagickRealType)
+ GetPixelBlue(q),beta)+0.5);
#else
- SetOpacityPixelComponent(composite,QuantumRange*(1.0-gamma));
+ SetPixelOpacity(composite,QuantumRange*(1.0-gamma));
gamma=1.0/(gamma <= MagickEpsilon ? 1.0 : gamma);
- SetRedPixelComponent(composite,gamma*MagickOver_((MagickRealType)
- GetRedPixelComponent(p),alpha,(MagickRealType)
- GetRedPixelComponent(q),beta));
- SetGreenPixelComponent(composite,gamma*MagickOver_((MagickRealType)
- GetGreenPixelComponent(p),alpha,(MagickRealType)
- GetGreenPixelComponent(q),beta));
- SetBluePixelComponent(composite,gamma*MagickOver_((MagickRealType)
- GetBluePixelComponent(p),alpha,(MagickRealType)
- GetBluePixelComponent(q),beta));
+ SetPixelRed(composite,gamma*MagickOver_((MagickRealType)
+ GetPixelRed(p),alpha,(MagickRealType)
+ GetPixelRed(q),beta));
+ SetPixelGreen(composite,gamma*MagickOver_((MagickRealType)
+ GetPixelGreen(p),alpha,(MagickRealType)
+ GetPixelGreen(q),beta));
+ SetPixelBlue(composite,gamma*MagickOver_((MagickRealType)
+ GetPixelBlue(p),alpha,(MagickRealType)
+ GetPixelBlue(q),beta));
#endif
}
diff --git a/magick/composite.c b/magick/composite.c
index c5033fc..bc08988 100644
--- a/magick/composite.c
+++ b/magick/composite.c
@@ -1878,17 +1878,17 @@
angle;
angle=angle_start+angle_range*QuantumScale*
- GetBluePixelComponent(p);
+ GetPixelBlue(p);
blur.x1=width*cos(angle);
blur.x2=width*sin(angle);
blur.y1=(-height*sin(angle));
blur.y2=height*cos(angle);
}
ScaleResampleFilter(resample_filter,blur.x1*QuantumScale*
- GetRedPixelComponent(p),blur.y1*QuantumScale*
- GetGreenPixelComponent(p),blur.x2*QuantumScale*
- GetRedPixelComponent(p),blur.y2*QuantumScale*
- GetGreenPixelComponent(p));
+ GetPixelRed(p),blur.y1*QuantumScale*
+ GetPixelGreen(p),blur.x2*QuantumScale*
+ GetPixelRed(p),blur.y2*QuantumScale*
+ GetPixelGreen(p));
(void) ResamplePixelColor(resample_filter,(double) x_offset+x,
(double) y_offset+y,&pixel);
SetPixelPacket(destination_image,&pixel,r,destination_indexes+x);
@@ -2051,11 +2051,11 @@
/*
Displace the offset.
*/
- offset.x=(horizontal_scale*(GetRedPixelComponent(p)-
+ offset.x=(horizontal_scale*(GetPixelRed(p)-
(((MagickRealType) QuantumRange+1.0)/2.0)))/(((MagickRealType)
QuantumRange+1.0)/2.0)+center.x+((compose == DisplaceCompositeOp) ?
x : 0);
- offset.y=(vertical_scale*(GetGreenPixelComponent(p)-
+ offset.y=(vertical_scale*(GetPixelGreen(p)-
(((MagickRealType) QuantumRange+1.0)/2.0)))/(((MagickRealType)
QuantumRange+1.0)/2.0)+center.y+((compose == DisplaceCompositeOp) ?
y : 0);
@@ -2066,7 +2066,7 @@
Mask with the 'invalid pixel mask' in alpha channel.
*/
pixel.opacity=(MagickRealType) QuantumRange*(1.0-(1.0-QuantumScale*
- pixel.opacity)*(1.0-QuantumScale*GetOpacityPixelComponent(p)));
+ pixel.opacity)*(1.0-QuantumScale*GetPixelOpacity(p)));
SetPixelPacket(destination_image,&pixel,r,destination_indexes+x);
p++;
r++;
@@ -2278,13 +2278,13 @@
if ((x-x_offset) >= (ssize_t) composite_image->columns)
break;
}
- destination.red=(MagickRealType) GetRedPixelComponent(q);
- destination.green=(MagickRealType) GetGreenPixelComponent(q);
- destination.blue=(MagickRealType) GetBluePixelComponent(q);
+ destination.red=(MagickRealType) GetPixelRed(q);
+ destination.green=(MagickRealType) GetPixelGreen(q);
+ destination.blue=(MagickRealType) GetPixelBlue(q);
if (image->matte != MagickFalse)
- destination.opacity=(MagickRealType) GetOpacityPixelComponent(q);
+ destination.opacity=(MagickRealType) GetPixelOpacity(q);
if (image->colorspace == CMYKColorspace)
- destination.index=(MagickRealType) GetIndexPixelComponent(indexes+x);
+ destination.index=(MagickRealType) GetPixelIndex(indexes+x);
if (image->colorspace == CMYKColorspace)
{
destination.red=(MagickRealType) QuantumRange-destination.red;
@@ -2340,26 +2340,26 @@
composite.blue=(MagickRealType) QuantumRange-composite.blue;
composite.index=(MagickRealType) QuantumRange-composite.index;
}
- SetRedPixelComponent(q,ClampToQuantum(composite.red));
- SetGreenPixelComponent(q,ClampToQuantum(composite.green));
- SetBluePixelComponent(q,ClampToQuantum(composite.blue));
+ SetPixelRed(q,ClampToQuantum(composite.red));
+ SetPixelGreen(q,ClampToQuantum(composite.green));
+ SetPixelBlue(q,ClampToQuantum(composite.blue));
if (image->matte != MagickFalse)
- SetOpacityPixelComponent(q,ClampToQuantum(composite.opacity));
+ SetPixelOpacity(q,ClampToQuantum(composite.opacity));
if (image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(indexes+x,ClampToQuantum(composite.index));
+ SetPixelIndex(indexes+x,ClampToQuantum(composite.index));
q++;
continue;
}
/*
Handle normal overlay of source onto destination.
*/
- source.red=(MagickRealType) GetRedPixelComponent(p);
- source.green=(MagickRealType) GetGreenPixelComponent(p);
- source.blue=(MagickRealType) GetBluePixelComponent(p);
+ source.red=(MagickRealType) GetPixelRed(p);
+ source.green=(MagickRealType) GetPixelGreen(p);
+ source.blue=(MagickRealType) GetPixelBlue(p);
if (composite_image->matte != MagickFalse)
- source.opacity=(MagickRealType) GetOpacityPixelComponent(p);
+ source.opacity=(MagickRealType) GetPixelOpacity(p);
if (composite_image->colorspace == CMYKColorspace)
- source.index=(MagickRealType) GetIndexPixelComponent(composite_indexes+
+ source.index=(MagickRealType) GetPixelIndex(composite_indexes+
x-x_offset);
if (composite_image->colorspace == CMYKColorspace)
{
@@ -2759,12 +2759,12 @@
composite.blue=(MagickRealType) QuantumRange-composite.blue;
composite.index=(MagickRealType) QuantumRange-composite.index;
}
- SetRedPixelComponent(q,ClampToQuantum(composite.red));
- SetGreenPixelComponent(q,ClampToQuantum(composite.green));
- SetBluePixelComponent(q,ClampToQuantum(composite.blue));
- SetOpacityPixelComponent(q,ClampToQuantum(composite.opacity));
+ SetPixelRed(q,ClampToQuantum(composite.red));
+ SetPixelGreen(q,ClampToQuantum(composite.green));
+ SetPixelBlue(q,ClampToQuantum(composite.blue));
+ SetPixelOpacity(q,ClampToQuantum(composite.opacity));
if (image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(indexes+x,ClampToQuantum(composite.index));
+ SetPixelIndex(indexes+x,ClampToQuantum(composite.index));
p++;
if (p >= (pixels+composite_image->columns))
p=pixels;
diff --git a/magick/compress.c b/magick/compress.c
index c5c9031..313bd68 100644
--- a/magick/compress.c
+++ b/magick/compress.c
@@ -637,8 +637,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
index=(IndexPacket) (*p++);
- SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+ SetPixelIndex(indexes+x,index);
+ SetPixelRGBO(q,image->colormap+(ssize_t) index);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
diff --git a/magick/decorate.c b/magick/decorate.c
index 01aed66..1595437 100644
--- a/magick/decorate.c
+++ b/magick/decorate.c
@@ -747,40 +747,40 @@
}
for (x=0; x < y; x++)
{
- SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetRedPixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+ SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(q)*HighlightFactor+(MagickRealType) foreground*
(QuantumRange-HighlightFactor))));
- SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetGreenPixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+ SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(q)*HighlightFactor+(MagickRealType) foreground*
(QuantumRange-HighlightFactor))));
- SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetBluePixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+ SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(q)*HighlightFactor+(MagickRealType) foreground*
(QuantumRange-HighlightFactor))));
q++;
}
for ( ; x < (ssize_t) (image->columns-y); x++)
{
- SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetRedPixelComponent(q)*AccentuateFactor+(MagickRealType) foreground*
+ SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(q)*AccentuateFactor+(MagickRealType) foreground*
(QuantumRange-AccentuateFactor))));
- SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetGreenPixelComponent(q)*AccentuateFactor+(MagickRealType) foreground*
+ SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(q)*AccentuateFactor+(MagickRealType) foreground*
(QuantumRange-AccentuateFactor))));
- SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetBluePixelComponent(q)*AccentuateFactor+(MagickRealType) foreground*
+ SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(q)*AccentuateFactor+(MagickRealType) foreground*
(QuantumRange-AccentuateFactor))));
q++;
}
for ( ; x < (ssize_t) image->columns; x++)
{
- SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetRedPixelComponent(q)*ShadowFactor+(MagickRealType) background*
+ SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(q)*ShadowFactor+(MagickRealType) background*
(QuantumRange-ShadowFactor))));
- SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetGreenPixelComponent(q)*ShadowFactor+(MagickRealType) background*
+ SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(q)*ShadowFactor+(MagickRealType) background*
(QuantumRange-ShadowFactor))));
- SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetBluePixelComponent(q)*ShadowFactor+(MagickRealType) background*
+ SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(q)*ShadowFactor+(MagickRealType) background*
(QuantumRange-ShadowFactor))));
q++;
}
@@ -817,14 +817,14 @@
}
for (x=0; x < (ssize_t) raise_info->width; x++)
{
- SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetRedPixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+ SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(q)*HighlightFactor+(MagickRealType) foreground*
(QuantumRange-HighlightFactor))));
- SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetGreenPixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+ SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(q)*HighlightFactor+(MagickRealType) foreground*
(QuantumRange-HighlightFactor))));
- SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetBluePixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+ SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(q)*HighlightFactor+(MagickRealType) foreground*
(QuantumRange-HighlightFactor))));
q++;
}
@@ -832,14 +832,14 @@
q++;
for ( ; x < (ssize_t) image->columns; x++)
{
- SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetRedPixelComponent(q)*ShadowFactor+(MagickRealType) background*
+ SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(q)*ShadowFactor+(MagickRealType) background*
(QuantumRange-ShadowFactor))));
- SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetGreenPixelComponent(q)*ShadowFactor+(MagickRealType) background*
+ SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(q)*ShadowFactor+(MagickRealType) background*
(QuantumRange-ShadowFactor))));
- SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetBluePixelComponent(q)*ShadowFactor+(MagickRealType) background*
+ SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(q)*ShadowFactor+(MagickRealType) background*
(QuantumRange-ShadowFactor))));
q++;
}
@@ -876,40 +876,40 @@
}
for (x=0; x < (ssize_t) (image->rows-y); x++)
{
- SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetRedPixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+ SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(q)*HighlightFactor+(MagickRealType) foreground*
(QuantumRange-HighlightFactor))));
- SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetGreenPixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+ SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(q)*HighlightFactor+(MagickRealType) foreground*
(QuantumRange-HighlightFactor))));
- SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetBluePixelComponent(q)*HighlightFactor+(MagickRealType) foreground*
+ SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(q)*HighlightFactor+(MagickRealType) foreground*
(QuantumRange-HighlightFactor))));
q++;
}
for ( ; x < (ssize_t) (image->columns-(image->rows-y)); x++)
{
- SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetRedPixelComponent(q)*TroughFactor+(MagickRealType) background*
+ SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(q)*TroughFactor+(MagickRealType) background*
(QuantumRange-TroughFactor))));
- SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetGreenPixelComponent(q)*TroughFactor+(MagickRealType) background*
+ SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(q)*TroughFactor+(MagickRealType) background*
(QuantumRange-TroughFactor))));
- SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetBluePixelComponent(q)*TroughFactor+(MagickRealType) background*
+ SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(q)*TroughFactor+(MagickRealType) background*
(QuantumRange-TroughFactor))));
q++;
}
for ( ; x < (ssize_t) image->columns; x++)
{
- SetRedPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetRedPixelComponent(q)*ShadowFactor+(MagickRealType) background*
+ SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(q)*ShadowFactor+(MagickRealType) background*
(QuantumRange-ShadowFactor))));
- SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetGreenPixelComponent(q)*ShadowFactor+(MagickRealType) background*
+ SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(q)*ShadowFactor+(MagickRealType) background*
(QuantumRange-ShadowFactor))));
- SetBluePixelComponent(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetBluePixelComponent(q)*ShadowFactor+(MagickRealType) background*
+ SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(q)*ShadowFactor+(MagickRealType) background*
(QuantumRange-ShadowFactor))));
q++;
}
diff --git a/magick/deprecate.c b/magick/deprecate.c
index 2042269..129a5ad 100644
--- a/magick/deprecate.c
+++ b/magick/deprecate.c
@@ -1360,7 +1360,7 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetOpacityPixelComponent(p) != OpaqueOpacity)
+ if (GetPixelOpacity(p) != OpaqueOpacity)
{
(void) GetFillColor(draw_info,x,y,&fill_color);
MagickCompositeOver(&fill_color,(MagickRealType) fill_color.opacity,q,
@@ -1833,26 +1833,26 @@
MagickRealType
pixel;
- pixel=QuantumScale*(GetRedPixelComponent(p)-(double)
- GetRedPixelComponent(q));
+ pixel=QuantumScale*(GetPixelRed(p)-(double)
+ GetPixelRed(q));
similarity+=pixel*pixel;
- pixel=QuantumScale*(GetGreenPixelComponent(p)-(double)
- GetGreenPixelComponent(q));
+ pixel=QuantumScale*(GetPixelGreen(p)-(double)
+ GetPixelGreen(q));
similarity+=pixel*pixel;
- pixel=QuantumScale*(GetBluePixelComponent(p)-(double)
- GetBluePixelComponent(q));
+ pixel=QuantumScale*(GetPixelBlue(p)-(double)
+ GetPixelBlue(q));
similarity+=pixel*pixel;
if ((image->matte != MagickFalse) && (reference->matte != MagickFalse))
{
- pixel=QuantumScale*(GetOpacityPixelComponent(p)-(double)
- GetOpacityPixelComponent(q));
+ pixel=QuantumScale*(GetPixelOpacity(p)-(double)
+ GetPixelOpacity(q));
similarity+=pixel*pixel;
}
if ((image->colorspace == CMYKColorspace) &&
(reference->colorspace == CMYKColorspace))
{
- pixel=QuantumScale*(GetIndexPixelComponent(indexes+x)-(double)
- GetIndexPixelComponent(reference_indexes+x));
+ pixel=QuantumScale*(GetPixelIndex(indexes+x)-(double)
+ GetPixelIndex(reference_indexes+x));
similarity+=pixel*pixel;
}
p++;
@@ -2151,20 +2151,20 @@
register MagickRealType
distance;
- if ((fuzz == 0.0) && (GetRedPixelComponent(p) == GetRedPixelComponent(q)) &&
- (GetGreenPixelComponent(p) == GetGreenPixelComponent(q)) &&
- (GetBluePixelComponent(p) == GetBluePixelComponent(q)))
+ if ((fuzz == 0.0) && (GetPixelRed(p) == GetPixelRed(q)) &&
+ (GetPixelGreen(p) == GetPixelGreen(q)) &&
+ (GetPixelBlue(p) == GetPixelBlue(q)))
return(MagickTrue);
- pixel.red=GetRedPixelComponent(p)-(MagickRealType) GetRedPixelComponent(q);
+ pixel.red=GetPixelRed(p)-(MagickRealType) GetPixelRed(q);
distance=pixel.red*pixel.red;
if (distance > (fuzz*fuzz))
return(MagickFalse);
- pixel.green=GetGreenPixelComponent(p)-(MagickRealType)
- GetGreenPixelComponent(q);
+ pixel.green=GetPixelGreen(p)-(MagickRealType)
+ GetPixelGreen(q);
distance+=pixel.green*pixel.green;
if (distance > (fuzz*fuzz))
return(MagickFalse);
- pixel.blue=GetBluePixelComponent(p)-(MagickRealType) GetBluePixelComponent(q);
+ pixel.blue=GetPixelBlue(p)-(MagickRealType) GetPixelBlue(q);
distance+=pixel.blue*pixel.blue;
if (distance > (fuzz*fuzz))
return(MagickFalse);
@@ -3519,7 +3519,7 @@
alpha[i]=1.0;
if (image->matte != MagickFalse)
{
- alpha[i]=QuantumScale*((MagickRealType) GetAlphaPixelComponent(p));
+ alpha[i]=QuantumScale*((MagickRealType) GetPixelAlpha(p));
pixels[i].red*=alpha[i];
pixels[i].green*=alpha[i];
pixels[i].blue*=alpha[i];
@@ -3562,7 +3562,7 @@
alpha[i]=1.0;
if (image->matte != MagickFalse)
{
- alpha[i]=QuantumScale*((MagickRealType) GetAlphaPixelComponent(p));
+ alpha[i]=QuantumScale*((MagickRealType) GetPixelAlpha(p));
pixels[i].red*=alpha[i];
pixels[i].green*=alpha[i];
pixels[i].blue*=alpha[i];
@@ -3603,7 +3603,7 @@
alpha[i]=1.0;
if (image->matte != MagickFalse)
{
- alpha[i]=QuantumScale*((MagickRealType) GetAlphaPixelComponent(p));
+ alpha[i]=QuantumScale*((MagickRealType) GetPixelAlpha(p));
pixels[i].red*=alpha[i];
pixels[i].green*=alpha[i];
pixels[i].blue*=alpha[i];
@@ -3710,7 +3710,7 @@
alpha[i]=1.0;
if (image->matte != MagickFalse)
{
- alpha[i]=QuantumScale*((MagickRealType) GetAlphaPixelComponent(p));
+ alpha[i]=QuantumScale*((MagickRealType) GetPixelAlpha(p));
pixels[i].red*=alpha[i];
pixels[i].green*=alpha[i];
pixels[i].blue*=alpha[i];
@@ -3868,7 +3868,7 @@
if (image->matte != MagickFalse)
{
alpha[n]=QuantumScale*((MagickRealType)
- GetAlphaPixelComponent(p));
+ GetPixelAlpha(p));
pixels[n].red*=alpha[n];
pixels[n].green*=alpha[n];
pixels[n].blue*=alpha[n];
@@ -4535,7 +4535,7 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetOpacityPixelComponent(p) != OpaqueOpacity)
+ if (GetPixelOpacity(p) != OpaqueOpacity)
q->opacity=opacity;
p++;
q++;
@@ -5553,8 +5553,8 @@
else if (order == 4)
threshold=(MagickRealType) QuantumRange*o4[(x%4)+4*(y%4)];
index=(IndexPacket) (intensity <= threshold ? 0 : 1);
- SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+ SetPixelIndex(indexes+x,index);
+ SetPixelRGBO(q,image->colormap+(ssize_t) index);
q++;
}
}
@@ -5581,7 +5581,7 @@
threshold=(MagickRealType) QuantumRange*o3[(x%3)+3*(y%3)];
else if (order == 4)
threshold=(MagickRealType) QuantumRange*o4[(x%4)+4*(y%4)]/1.7;
- SetOpacityPixelComponent(q,(MagickRealType) q->opacity <=
+ SetPixelOpacity(q,(MagickRealType) q->opacity <=
threshold ? 0 : QuantumRange);
q++;
}
@@ -5955,12 +5955,12 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRGBOPixelComponents(q,&background_color);
+ SetPixelRGBO(q,&background_color);
q++;
}
indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
- SetIndexPixelComponent(indexes+x,0);
+ SetPixelIndex(indexes+x,0);
if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
break;
}
@@ -5982,7 +5982,7 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRGBOPixelComponents(q,&background_color);
+ SetPixelRGBO(q,&background_color);
q++;
}
if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
@@ -6620,8 +6620,8 @@
{
index=(IndexPacket) ((MagickRealType) PixelIntensityToQuantum(q) <=
threshold ? 0 : 1);
- SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+ SetPixelIndex(indexes+x,index);
+ SetPixelRGBO(q,image->colormap+(ssize_t) index);
q++;
}
if (!SyncAuthenticPixels(image,&image->exception))
@@ -6735,22 +6735,22 @@
{
index=(IndexPacket) ((MagickRealType)
PixelIntensityToQuantum(q) <= pixel.red ? 0 : 1);
- SetIndexPixelComponent(indexes+x,index);
- SetRedPixelComponent(q,image->colormap[(ssize_t) index].red);
- SetGreenPixelComponent(q,image->colormap[(ssize_t) index].green);
- SetBluePixelComponent(q,image->colormap[(ssize_t) index].blue);
+ SetPixelIndex(indexes+x,index);
+ SetPixelRed(q,image->colormap[(ssize_t) index].red);
+ SetPixelGreen(q,image->colormap[(ssize_t) index].green);
+ SetPixelBlue(q,image->colormap[(ssize_t) index].blue);
q++;
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRedPixelComponent(q,(MagickRealType) q->red <= pixel.red
+ SetPixelRed(q,(MagickRealType) q->red <= pixel.red
? 0 : QuantumRange);
- SetGreenPixelComponent(q,(MagickRealType) q->green <= pixel.green
+ SetPixelGreen(q,(MagickRealType) q->green <= pixel.green
? 0 : QuantumRange);
- SetBluePixelComponent(q,(MagickRealType) q->blue <= pixel.blue
+ SetPixelBlue(q,(MagickRealType) q->blue <= pixel.blue
? 0 : QuantumRange);
- SetOpacityPixelComponent(q,(MagickRealType) q->opacity <= pixel.opacity
+ SetPixelOpacity(q,(MagickRealType) q->opacity <= pixel.opacity
? 0 : QuantumRange);
q++;
}
diff --git a/magick/distort.c b/magick/distort.c
index 70a8676..e585e75 100644
--- a/magick/distort.c
+++ b/magick/distort.c
@@ -2547,7 +2547,7 @@
ScaleFilter( resample_filter[id],
cx*cx, 0.0, s.y*cx/coeff[1], cx );
#if 1
-//if ( i == 0 && j == 0 ) {
+/*if ( i == 0 && j == 0 ) {*/
if ( d.x == 0.5 && d.y == 0.5 ) {
fprintf(stderr, "x=%lf y=%lf u=%lf v=%lf\n", d.x*coeff[1], d.y, s.x, s.y);
fprintf(stderr, "radius = %lf phi = %lf validity = %lf\n",
diff --git a/magick/draw.c b/magick/draw.c
index c79c0e0..d40c927 100644
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -3624,7 +3624,7 @@
return(polygon_info);
}
-static MagickRealType GetPixelOpacity(PolygonInfo *polygon_info,
+static MagickRealType GetOpacityPixel(PolygonInfo *polygon_info,
const MagickRealType mid,const MagickBooleanType fill,
const FillRule fill_rule,const double x,const double y,
MagickRealType *stroke_opacity)
@@ -3968,7 +3968,7 @@
/*
Fill and/or stroke.
*/
- fill_opacity=GetPixelOpacity(polygon_info[id],mid,fill,
+ fill_opacity=GetOpacityPixel(polygon_info[id],mid,fill,
draw_info->fill_rule,(double) x,(double) y,&stroke_opacity);
if (draw_info->stroke_antialias == MagickFalse)
{
@@ -4302,7 +4302,7 @@
if (q == (PixelPacket *) NULL)
break;
(void) GetFillColor(draw_info,x,y,&pixel);
- SetOpacityPixelComponent(q,pixel.opacity);
+ SetPixelOpacity(q,pixel.opacity);
(void) SyncCacheViewAuthenticPixels(image_view,exception);
break;
}
@@ -4336,7 +4336,7 @@
continue;
}
(void) GetFillColor(draw_info,x,y,&pixel);
- SetOpacityPixelComponent(q,pixel.opacity);
+ SetPixelOpacity(q,pixel.opacity);
q++;
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -4386,7 +4386,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
(void) GetFillColor(draw_info,x,y,&pixel);
- SetOpacityPixelComponent(q,pixel.opacity);
+ SetPixelOpacity(q,pixel.opacity);
q++;
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
diff --git a/magick/effect.c b/magick/effect.c
index 95912fb..668be14 100644
--- a/magick/effect.c
+++ b/magick/effect.c
@@ -340,19 +340,18 @@
alpha=1.0;
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse))
- alpha=(MagickRealType) (QuantumScale*GetAlphaPixelComponent(p));
+ alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(p));
if ((channel & RedChannel) != 0)
- pixel.red+=(*k)*alpha*GetRedPixelComponent(p);
+ pixel.red+=(*k)*alpha*GetPixelRed(p);
if ((channel & GreenChannel) != 0)
- pixel.green+=(*k)*alpha*GetGreenPixelComponent(p);
+ pixel.green+=(*k)*alpha*GetPixelGreen(p);
if ((channel & BlueChannel) != 0)
- pixel.blue+=(*k)*alpha*GetBluePixelComponent(p);
+ pixel.blue+=(*k)*alpha*GetPixelBlue(p);
if ((channel & OpacityChannel) != 0)
- pixel.opacity+=(*k)*GetOpacityPixelComponent(p);
+ pixel.opacity+=(*k)*GetPixelOpacity(p);
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- pixel.index+=(*k)*alpha*GetIndexPixelComponent(indexes+x+(width-i)*
- v+u);
+ pixel.index+=(*k)*alpha*GetPixelIndex(indexes+x+(width-i)*v+u);
gamma+=(*k)*alpha;
k++;
p++;
@@ -360,17 +359,16 @@
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+ SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
if ((channel & OpacityChannel) != 0)
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(gamma*
- pixel.index));
+ SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*pixel.index));
q++;
r++;
}
@@ -660,19 +658,18 @@
alpha=1.0;
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse))
- alpha=(MagickRealType) (QuantumScale*GetAlphaPixelComponent(p));
+ alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(p));
if ((channel & RedChannel) != 0)
- pixel.red+=(*k)*alpha*GetRedPixelComponent(p);
+ pixel.red+=(*k)*alpha*GetPixelRed(p);
if ((channel & GreenChannel) != 0)
- pixel.green+=(*k)*alpha*GetGreenPixelComponent(p);
+ pixel.green+=(*k)*alpha*GetPixelGreen(p);
if ((channel & BlueChannel) != 0)
- pixel.blue+=(*k)*alpha*GetBluePixelComponent(p);
+ pixel.blue+=(*k)*alpha*GetPixelBlue(p);
if ((channel & OpacityChannel) != 0)
- pixel.opacity+=(*k)*GetOpacityPixelComponent(p);
+ pixel.opacity+=(*k)*GetPixelOpacity(p);
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- pixel.index+=(*k)*alpha*GetIndexPixelComponent(indexes+x+(width-i)*
- v+u);
+ pixel.index+=(*k)*alpha*GetPixelIndex(indexes+x+(width-i)*v+u);
gamma+=(*k)*alpha;
k++;
p++;
@@ -680,17 +677,16 @@
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+ SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
if ((channel & OpacityChannel) != 0)
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(sharp_indexes+x,ClampToQuantum(gamma*
- pixel.index));
+ SetPixelIndex(sharp_indexes+x,ClampToQuantum(gamma*pixel.index));
q++;
r++;
}
@@ -959,29 +955,29 @@
{
for (i=0; i < (ssize_t) width; i++)
{
- pixel.red+=(*k)*GetRedPixelComponent(kernel_pixels);
- pixel.green+=(*k)*GetGreenPixelComponent(kernel_pixels);
- pixel.blue+=(*k)*GetBluePixelComponent(kernel_pixels);
+ pixel.red+=(*k)*GetPixelRed(kernel_pixels);
+ pixel.green+=(*k)*GetPixelGreen(kernel_pixels);
+ pixel.blue+=(*k)*GetPixelBlue(kernel_pixels);
k++;
kernel_pixels++;
}
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(pixel.red));
+ SetPixelRed(q,ClampToQuantum(pixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
+ SetPixelGreen(q,ClampToQuantum(pixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+ SetPixelBlue(q,ClampToQuantum(pixel.blue));
if ((channel & OpacityChannel) != 0)
{
k=kernel;
kernel_pixels=p;
for (i=0; i < (ssize_t) width; i++)
{
- pixel.opacity+=(*k)*GetOpacityPixelComponent(kernel_pixels);
+ pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels);
k++;
kernel_pixels++;
}
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
}
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
@@ -993,12 +989,11 @@
kernel_indexes=indexes;
for (i=0; i < (ssize_t) width; i++)
{
- pixel.index+=(*k)*GetIndexPixelComponent(kernel_indexes);
+ pixel.index+=(*k)*GetPixelIndex(kernel_indexes);
k++;
kernel_indexes++;
}
- SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(
- pixel.index));
+ SetPixelIndex(blur_indexes+x,ClampToQuantum(pixel.index));
}
}
else
@@ -1010,33 +1005,32 @@
gamma=0.0;
for (i=0; i < (ssize_t) width; i++)
{
- alpha=(MagickRealType) (QuantumScale*
- GetAlphaPixelComponent(kernel_pixels));
- pixel.red+=(*k)*alpha*GetRedPixelComponent(kernel_pixels);
- pixel.green+=(*k)*alpha*GetGreenPixelComponent(kernel_pixels);
- pixel.blue+=(*k)*alpha*GetBluePixelComponent(kernel_pixels);
+ alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(kernel_pixels));
+ pixel.red+=(*k)*alpha*GetPixelRed(kernel_pixels);
+ pixel.green+=(*k)*alpha*GetPixelGreen(kernel_pixels);
+ pixel.blue+=(*k)*alpha*GetPixelBlue(kernel_pixels);
gamma+=(*k)*alpha;
k++;
kernel_pixels++;
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+ SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
if ((channel & OpacityChannel) != 0)
{
k=kernel;
kernel_pixels=p;
for (i=0; i < (ssize_t) width; i++)
{
- pixel.opacity+=(*k)*GetOpacityPixelComponent(kernel_pixels);
+ pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels);
k++;
kernel_pixels++;
}
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
}
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
@@ -1050,14 +1044,13 @@
for (i=0; i < (ssize_t) width; i++)
{
alpha=(MagickRealType) (QuantumScale*
- GetAlphaPixelComponent(kernel_pixels));
+ GetPixelAlpha(kernel_pixels));
pixel.index+=(*k)*alpha*(*kernel_indexes);
k++;
kernel_pixels++;
kernel_indexes++;
}
- SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(gamma*
- pixel.index));
+ SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*pixel.index));
}
}
indexes++;
@@ -1140,29 +1133,29 @@
{
for (i=0; i < (ssize_t) width; i++)
{
- pixel.red+=(*k)*GetRedPixelComponent(kernel_pixels);
- pixel.green+=(*k)*GetGreenPixelComponent(kernel_pixels);
- pixel.blue+=(*k)*GetBluePixelComponent(kernel_pixels);
+ pixel.red+=(*k)*GetPixelRed(kernel_pixels);
+ pixel.green+=(*k)*GetPixelGreen(kernel_pixels);
+ pixel.blue+=(*k)*GetPixelBlue(kernel_pixels);
k++;
kernel_pixels++;
}
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(pixel.red));
+ SetPixelRed(q,ClampToQuantum(pixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
+ SetPixelGreen(q,ClampToQuantum(pixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+ SetPixelBlue(q,ClampToQuantum(pixel.blue));
if ((channel & OpacityChannel) != 0)
{
k=kernel;
kernel_pixels=p;
for (i=0; i < (ssize_t) width; i++)
{
- pixel.opacity+=(*k)*GetOpacityPixelComponent(kernel_pixels);
+ pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels);
k++;
kernel_pixels++;
}
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
}
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
@@ -1174,12 +1167,11 @@
kernel_indexes=indexes;
for (i=0; i < (ssize_t) width; i++)
{
- pixel.index+=(*k)*GetIndexPixelComponent(kernel_indexes);
+ pixel.index+=(*k)*GetPixelIndex(kernel_indexes);
k++;
kernel_indexes++;
}
- SetIndexPixelComponent(blur_indexes+y,ClampToQuantum(
- pixel.index));
+ SetPixelIndex(blur_indexes+y,ClampToQuantum(pixel.index));
}
}
else
@@ -1192,32 +1184,32 @@
for (i=0; i < (ssize_t) width; i++)
{
alpha=(MagickRealType) (QuantumScale*
- GetAlphaPixelComponent(kernel_pixels));
- pixel.red+=(*k)*alpha*GetRedPixelComponent(kernel_pixels);
- pixel.green+=(*k)*alpha*GetGreenPixelComponent(kernel_pixels);
- pixel.blue+=(*k)*alpha*GetBluePixelComponent(kernel_pixels);
+ GetPixelAlpha(kernel_pixels));
+ pixel.red+=(*k)*alpha*GetPixelRed(kernel_pixels);
+ pixel.green+=(*k)*alpha*GetPixelGreen(kernel_pixels);
+ pixel.blue+=(*k)*alpha*GetPixelBlue(kernel_pixels);
gamma+=(*k)*alpha;
k++;
kernel_pixels++;
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+ SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
if ((channel & OpacityChannel) != 0)
{
k=kernel;
kernel_pixels=p;
for (i=0; i < (ssize_t) width; i++)
{
- pixel.opacity+=(*k)*GetOpacityPixelComponent(kernel_pixels);
+ pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels);
k++;
kernel_pixels++;
}
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
}
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
@@ -1231,14 +1223,13 @@
for (i=0; i < (ssize_t) width; i++)
{
alpha=(MagickRealType) (QuantumScale*
- GetAlphaPixelComponent(kernel_pixels));
+ GetPixelAlpha(kernel_pixels));
pixel.index+=(*k)*alpha*(*kernel_indexes);
k++;
kernel_pixels++;
kernel_indexes++;
}
- SetIndexPixelComponent(blur_indexes+y,ClampToQuantum(gamma*
- pixel.index));
+ SetPixelIndex(blur_indexes+y,ClampToQuantum(gamma*pixel.index));
}
}
indexes++;
@@ -1500,11 +1491,11 @@
kernel_pixels+=image->columns+width;
}
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(pixel.red));
+ SetPixelRed(q,ClampToQuantum(pixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
+ SetPixelGreen(q,ClampToQuantum(pixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+ SetPixelBlue(q,ClampToQuantum(pixel.blue));
if ((channel & OpacityChannel) != 0)
{
k=normal_kernel;
@@ -1518,7 +1509,7 @@
}
kernel_pixels+=image->columns+width;
}
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
}
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
@@ -1532,13 +1523,12 @@
{
for (u=0; u < (ssize_t) width; u++)
{
- pixel.index+=(*k)*GetIndexPixelComponent(kernel_indexes+u);
+ pixel.index+=(*k)*GetPixelIndex(kernel_indexes+u);
k++;
}
kernel_indexes+=image->columns+width;
}
- SetIndexPixelComponent(convolve_indexes+x,ClampToQuantum(
- pixel.index));
+ SetPixelIndex(convolve_indexes+x,ClampToQuantum(pixel.index));
}
}
else
@@ -1564,11 +1554,11 @@
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+ SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
if ((channel & OpacityChannel) != 0)
{
k=normal_kernel;
@@ -1577,12 +1567,12 @@
{
for (u=0; u < (ssize_t) width; u++)
{
- pixel.opacity+=(*k)*GetOpacityPixelComponent(kernel_pixels+u);
+ pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels+u);
k++;
}
kernel_pixels+=image->columns+width;
}
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
}
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
@@ -1599,14 +1589,14 @@
{
alpha=(MagickRealType) (QuantumScale*(QuantumRange-
kernel_pixels[u].opacity));
- pixel.index+=(*k)*alpha*GetIndexPixelComponent(
+ pixel.index+=(*k)*alpha*GetPixelIndex(
kernel_indexes+u);
k++;
}
kernel_pixels+=image->columns+width;
kernel_indexes+=image->columns+width;
}
- SetIndexPixelComponent(convolve_indexes+x,ClampToQuantum(gamma*
+ SetPixelIndex(convolve_indexes+x,ClampToQuantum(gamma*
pixel.index));
}
}
@@ -1872,11 +1862,11 @@
{
switch (i)
{
- case 0: pixel[j]=GetRedPixelComponent(p); break;
- case 1: pixel[j]=GetGreenPixelComponent(p); break;
- case 2: pixel[j]=GetBluePixelComponent(p); break;
- case 3: pixel[j]=GetOpacityPixelComponent(p); break;
- case 4: pixel[j]=GetBlackPixelComponent(indexes+x); break;
+ case 0: pixel[j]=GetPixelRed(p); break;
+ case 1: pixel[j]=GetPixelGreen(p); break;
+ case 2: pixel[j]=GetPixelBlue(p); break;
+ case 3: pixel[j]=GetPixelOpacity(p); break;
+ case 4: pixel[j]=GetPixelBlack(indexes+x); break;
default: break;
}
p++;
@@ -1914,11 +1904,11 @@
{
switch (i)
{
- case 0: SetRedPixelComponent(q,pixel[j]); break;
- case 1: SetGreenPixelComponent(q,pixel[j]); break;
- case 2: SetBluePixelComponent(q,pixel[j]); break;
- case 3: SetOpacityPixelComponent(q,pixel[j]); break;
- case 4: SetIndexPixelComponent(indexes+x,pixel[j]); break;
+ case 0: SetPixelRed(q,pixel[j]); break;
+ case 1: SetPixelGreen(q,pixel[j]); break;
+ case 2: SetPixelBlue(q,pixel[j]); break;
+ case 3: SetPixelOpacity(q,pixel[j]); break;
+ case 4: SetPixelIndex(indexes+x,pixel[j]); break;
default: break;
}
q++;
@@ -2303,11 +2293,11 @@
kernel_pixels+=image->columns+kernel->width;
}
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(pixel.red));
+ SetPixelRed(q,ClampToQuantum(pixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
+ SetPixelGreen(q,ClampToQuantum(pixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+ SetPixelBlue(q,ClampToQuantum(pixel.blue));
if ((channel & OpacityChannel) != 0)
{
k=kernel->values;
@@ -2321,7 +2311,7 @@
}
kernel_pixels+=image->columns+kernel->width;
}
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
}
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
@@ -2335,13 +2325,12 @@
{
for (u=0; u < (ssize_t) kernel->height; u++)
{
- pixel.index+=(*k)*GetIndexPixelComponent(kernel_indexes+u);
+ pixel.index+=(*k)*GetPixelIndex(kernel_indexes+u);
k++;
}
kernel_indexes+=image->columns+kernel->width;
}
- SetIndexPixelComponent(filter_indexes+x,ClampToQuantum(
- pixel.index));
+ SetPixelIndex(filter_indexes+x,ClampToQuantum(pixel.index));
}
}
else
@@ -2356,10 +2345,10 @@
for (u=0; u < (ssize_t) kernel->height; u++)
{
alpha=(MagickRealType) (QuantumScale*(QuantumRange-
- GetOpacityPixelComponent(kernel_pixels+u)));
- pixel.red+=(*k)*alpha*GetRedPixelComponent(kernel_pixels+u);
- pixel.green+=(*k)*alpha*GetGreenPixelComponent(kernel_pixels+u);
- pixel.blue+=(*k)*alpha*GetBluePixelComponent(kernel_pixels+u);
+ GetPixelOpacity(kernel_pixels+u)));
+ pixel.red+=(*k)*alpha*GetPixelRed(kernel_pixels+u);
+ pixel.green+=(*k)*alpha*GetPixelGreen(kernel_pixels+u);
+ pixel.blue+=(*k)*alpha*GetPixelBlue(kernel_pixels+u);
gamma+=(*k)*alpha;
k++;
}
@@ -2367,11 +2356,11 @@
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+ SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
if ((channel & OpacityChannel) != 0)
{
k=kernel->values;
@@ -2380,12 +2369,12 @@
{
for (u=0; u < (ssize_t) kernel->height; u++)
{
- pixel.opacity+=(*k)*GetOpacityPixelComponent(kernel_pixels+u);
+ pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels+u);
k++;
}
kernel_pixels+=image->columns+kernel->width;
}
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
}
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
@@ -2402,15 +2391,13 @@
{
alpha=(MagickRealType) (QuantumScale*(QuantumRange-
kernel_pixels[u].opacity));
- pixel.index+=(*k)*alpha*GetIndexPixelComponent(
- kernel_indexes+u);
+ pixel.index+=(*k)*alpha*GetPixelIndex(kernel_indexes+u);
k++;
}
kernel_pixels+=image->columns+kernel->width;
kernel_indexes+=image->columns+kernel->width;
}
- SetIndexPixelComponent(filter_indexes+x,ClampToQuantum(gamma*
- pixel.index));
+ SetPixelIndex(filter_indexes+x,ClampToQuantum(gamma*pixel.index));
}
}
indexes++;
@@ -2763,16 +2750,16 @@
k++;
}
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(qixel.red));
+ SetPixelRed(q,ClampToQuantum(qixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(qixel.green));
+ SetPixelGreen(q,ClampToQuantum(qixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(qixel.blue));
+ SetPixelBlue(q,ClampToQuantum(qixel.blue));
if ((channel & OpacityChannel) != 0)
- SetOpacityPixelComponent(q,ClampToQuantum(qixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(qixel.opacity));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(qixel.index));
+ SetPixelIndex(blur_indexes+x,ClampToQuantum(qixel.index));
}
else
{
@@ -2786,8 +2773,7 @@
{
(void) GetOneCacheViewVirtualPixel(image_view,x+offset[i].x,y+
offset[i].y,&pixel,exception);
- alpha=(MagickRealType) (QuantumScale*
- GetAlphaPixelComponent(&pixel));
+ alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(&pixel));
qixel.red+=(*k)*alpha*pixel.red;
qixel.green+=(*k)*alpha*pixel.green;
qixel.blue+=(*k)*alpha*pixel.blue;
@@ -2795,24 +2781,23 @@
if (image->colorspace == CMYKColorspace)
{
indexes=GetCacheViewVirtualIndexQueue(image_view);
- qixel.index+=(*k)*alpha*GetIndexPixelComponent(indexes);
+ qixel.index+=(*k)*alpha*GetPixelIndex(indexes);
}
gamma+=(*k)*alpha;
k++;
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(gamma*qixel.red));
+ SetPixelRed(q,ClampToQuantum(gamma*qixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(gamma*qixel.green));
+ SetPixelGreen(q,ClampToQuantum(gamma*qixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(gamma*qixel.blue));
+ SetPixelBlue(q,ClampToQuantum(gamma*qixel.blue));
if ((channel & OpacityChannel) != 0)
- SetOpacityPixelComponent(q,ClampToQuantum(qixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(qixel.opacity));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(gamma*
- qixel.index));
+ SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*qixel.index));
}
q++;
}
@@ -3577,17 +3562,16 @@
normalize=1.0/(fabs((double) normalize) <= MagickEpsilon ? 1.0 :
normalize);
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(normalize*qixel.red));
+ SetPixelRed(q,ClampToQuantum(normalize*qixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(normalize*qixel.green));
+ SetPixelGreen(q,ClampToQuantum(normalize*qixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(normalize*qixel.blue));
+ SetPixelBlue(q,ClampToQuantum(normalize*qixel.blue));
if ((channel & OpacityChannel) != 0)
- SetOpacityPixelComponent(q,ClampToQuantum(normalize*qixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(normalize*qixel.opacity));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(normalize*
- qixel.index));
+ SetPixelIndex(blur_indexes+x,ClampToQuantum(normalize*qixel.index));
}
else
{
@@ -3604,7 +3588,7 @@
(ssize_t) (blur_center.y+center.x*sin_theta[i]+center.y*
cos_theta[i]+0.5),&pixel,exception);
alpha=(MagickRealType) (QuantumScale*
- GetAlphaPixelComponent(&pixel));
+ GetPixelAlpha(&pixel));
qixel.red+=alpha*pixel.red;
qixel.green+=alpha*pixel.green;
qixel.blue+=alpha*pixel.blue;
@@ -3621,17 +3605,16 @@
normalize=1.0/(fabs((double) normalize) <= MagickEpsilon ? 1.0 :
normalize);
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(gamma*qixel.red));
+ SetPixelRed(q,ClampToQuantum(gamma*qixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(gamma*qixel.green));
+ SetPixelGreen(q,ClampToQuantum(gamma*qixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(gamma*qixel.blue));
+ SetPixelBlue(q,ClampToQuantum(gamma*qixel.blue));
if ((channel & OpacityChannel) != 0)
- SetOpacityPixelComponent(q,ClampToQuantum(normalize*qixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(normalize*qixel.opacity));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(gamma*
- qixel.index));
+ SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*qixel.index));
}
q++;
}
@@ -3893,9 +3876,9 @@
{
if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
{
- pixel.red+=(*k)*GetRedPixelComponent(p+u+j);
- pixel.green+=(*k)*GetGreenPixelComponent(p+u+j);
- pixel.blue+=(*k)*GetBluePixelComponent(p+u+j);
+ pixel.red+=(*k)*GetPixelRed(p+u+j);
+ pixel.green+=(*k)*GetPixelGreen(p+u+j);
+ pixel.blue+=(*k)*GetPixelBlue(p+u+j);
gamma+=(*k);
k++;
}
@@ -3906,11 +3889,11 @@
{
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+ SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
}
if ((channel & OpacityChannel) != 0)
{
@@ -3933,8 +3916,7 @@
{
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 :
gamma);
- SetOpacityPixelComponent(q,ClampToQuantum(gamma*
- pixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(gamma*pixel.opacity));
}
}
if (((channel & IndexChannel) != 0) &&
@@ -3948,7 +3930,7 @@
{
if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
{
- pixel.index+=(*k)*GetIndexPixelComponent(indexes+x+u+j);
+ pixel.index+=(*k)*GetPixelIndex(indexes+x+u+j);
gamma+=(*k);
k++;
}
@@ -3959,7 +3941,7 @@
{
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 :
gamma);
- SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(gamma*
+ SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*
pixel.index));
}
}
@@ -3975,12 +3957,11 @@
{
if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
{
- alpha=(MagickRealType) (QuantumScale*
- GetAlphaPixelComponent(p+u+j));
- pixel.red+=(*k)*alpha*GetRedPixelComponent(p+u+j);
- pixel.green+=(*k)*alpha*GetGreenPixelComponent(p+u+j);
- pixel.blue+=(*k)*alpha*GetBluePixelComponent(p+u+j);
- pixel.opacity+=(*k)*GetOpacityPixelComponent(p+u+j);
+ alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(p+u+j));
+ pixel.red+=(*k)*alpha*GetPixelRed(p+u+j);
+ pixel.green+=(*k)*alpha*GetPixelGreen(p+u+j);
+ pixel.blue+=(*k)*alpha*GetPixelBlue(p+u+j);
+ pixel.opacity+=(*k)*GetPixelOpacity(p+u+j);
gamma+=(*k)*alpha;
k++;
}
@@ -3991,11 +3972,11 @@
{
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
+ SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
}
if ((channel & OpacityChannel) != 0)
{
@@ -4007,7 +3988,7 @@
{
if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
{
- pixel.opacity+=(*k)*GetOpacityPixelComponent(p+u+j);
+ pixel.opacity+=(*k)*GetPixelOpacity(p+u+j);
gamma+=(*k);
k++;
}
@@ -4018,7 +3999,7 @@
{
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 :
gamma);
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
}
}
if (((channel & IndexChannel) != 0) &&
@@ -4033,9 +4014,8 @@
if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
{
alpha=(MagickRealType) (QuantumScale*
- GetAlphaPixelComponent(p+u+j));
- pixel.index+=(*k)*alpha*GetIndexPixelComponent(indexes+x+
- u+j);
+ GetPixelAlpha(p+u+j));
+ pixel.index+=(*k)*alpha*GetPixelIndex(indexes+x+u+j);
gamma+=(*k);
k++;
}
@@ -4046,7 +4026,7 @@
{
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 :
gamma);
- SetIndexPixelComponent(blur_indexes+x,ClampToQuantum(gamma*
+ SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*
pixel.index));
}
}
@@ -4238,18 +4218,15 @@
}
if (gray != MagickFalse)
{
- SetRedPixelComponent(q,shade);
- SetGreenPixelComponent(q,shade);
- SetBluePixelComponent(q,shade);
+ SetPixelRed(q,shade);
+ SetPixelGreen(q,shade);
+ SetPixelBlue(q,shade);
}
else
{
- SetRedPixelComponent(q,ClampToQuantum(QuantumScale*shade*
- GetRedPixelComponent(s1)));
- SetGreenPixelComponent(q,ClampToQuantum(QuantumScale*shade*
- GetGreenPixelComponent(s1)));
- SetBluePixelComponent(q,ClampToQuantum(QuantumScale*shade*
- GetBluePixelComponent(s1)));
+ SetPixelRed(q,ClampToQuantum(QuantumScale*shade*GetPixelRed(s1)));
+ SetPixelGreen(q,ClampToQuantum(QuantumScale*shade*GetPixelGreen(s1)));
+ SetPixelBlue(q,ClampToQuantum(QuantumScale*shade*GetPixelBlue(s1)));
}
q->opacity=s1->opacity;
s0++;
@@ -5104,32 +5081,32 @@
unsigned short
index;
- index=ScaleQuantumToShort(GetRedPixelComponent(pixel));
+ index=ScaleQuantumToShort(GetPixelRed(pixel));
signature=pixel_list->lists[0].nodes[index].signature;
if (signature == pixel_list->signature)
pixel_list->lists[0].nodes[index].count++;
else
AddNodePixelList(pixel_list,0,index);
- index=ScaleQuantumToShort(GetGreenPixelComponent(pixel));
+ index=ScaleQuantumToShort(GetPixelGreen(pixel));
signature=pixel_list->lists[1].nodes[index].signature;
if (signature == pixel_list->signature)
pixel_list->lists[1].nodes[index].count++;
else
AddNodePixelList(pixel_list,1,index);
- index=ScaleQuantumToShort(GetBluePixelComponent(pixel));
+ index=ScaleQuantumToShort(GetPixelBlue(pixel));
signature=pixel_list->lists[2].nodes[index].signature;
if (signature == pixel_list->signature)
pixel_list->lists[2].nodes[index].count++;
else
AddNodePixelList(pixel_list,2,index);
- index=ScaleQuantumToShort(GetOpacityPixelComponent(pixel));
+ index=ScaleQuantumToShort(GetPixelOpacity(pixel));
signature=pixel_list->lists[3].nodes[index].signature;
if (signature == pixel_list->signature)
pixel_list->lists[3].nodes[index].count++;
else
AddNodePixelList(pixel_list,3,index);
if (image->colorspace == CMYKColorspace)
- index=ScaleQuantumToShort(GetIndexPixelComponent(indexes));
+ index=ScaleQuantumToShort(GetPixelIndex(indexes));
signature=pixel_list->lists[4].nodes[index].signature;
if (signature == pixel_list->signature)
pixel_list->lists[4].nodes[index].count++;
@@ -5364,17 +5341,17 @@
}
}
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(pixel.red));
+ SetPixelRed(q,ClampToQuantum(pixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
+ SetPixelGreen(q,ClampToQuantum(pixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+ SetPixelBlue(q,ClampToQuantum(pixel.blue));
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse))
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(statistic_indexes+x,ClampToQuantum(pixel.index));
+ SetPixelIndex(statistic_indexes+x,ClampToQuantum(pixel.index));
p++;
q++;
}
@@ -5542,53 +5519,51 @@
{
if ((channel & RedChannel) != 0)
{
- pixel.red=GetRedPixelComponent(p)-(MagickRealType)
- GetRedPixelComponent(q);
+ pixel.red=GetPixelRed(p)-(MagickRealType) GetPixelRed(q);
if (fabs(2.0*pixel.red) < quantum_threshold)
- pixel.red=(MagickRealType) GetRedPixelComponent(p);
+ pixel.red=(MagickRealType) GetPixelRed(p);
else
- pixel.red=(MagickRealType) GetRedPixelComponent(p)+
- (pixel.red*amount);
- SetRedPixelComponent(q,ClampToQuantum(pixel.red));
+ pixel.red=(MagickRealType) GetPixelRed(p)+(pixel.red*amount);
+ SetPixelRed(q,ClampToQuantum(pixel.red));
}
if ((channel & GreenChannel) != 0)
{
- pixel.green=GetGreenPixelComponent(p)-(MagickRealType) q->green;
+ pixel.green=GetPixelGreen(p)-(MagickRealType) q->green;
if (fabs(2.0*pixel.green) < quantum_threshold)
- pixel.green=(MagickRealType) GetGreenPixelComponent(p);
+ pixel.green=(MagickRealType) GetPixelGreen(p);
else
- pixel.green=(MagickRealType) GetGreenPixelComponent(p)+(pixel.green*amount);
- SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
+ pixel.green=(MagickRealType) GetPixelGreen(p)+(pixel.green*amount);
+ SetPixelGreen(q,ClampToQuantum(pixel.green));
}
if ((channel & BlueChannel) != 0)
{
- pixel.blue=GetBluePixelComponent(p)-(MagickRealType) q->blue;
+ pixel.blue=GetPixelBlue(p)-(MagickRealType) q->blue;
if (fabs(2.0*pixel.blue) < quantum_threshold)
- pixel.blue=(MagickRealType) GetBluePixelComponent(p);
+ pixel.blue=(MagickRealType) GetPixelBlue(p);
else
- pixel.blue=(MagickRealType) GetBluePixelComponent(p)+(pixel.blue*amount);
- SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+ pixel.blue=(MagickRealType) GetPixelBlue(p)+(pixel.blue*amount);
+ SetPixelBlue(q,ClampToQuantum(pixel.blue));
}
if ((channel & OpacityChannel) != 0)
{
- pixel.opacity=GetOpacityPixelComponent(p)-(MagickRealType) q->opacity;
+ pixel.opacity=GetPixelOpacity(p)-(MagickRealType) q->opacity;
if (fabs(2.0*pixel.opacity) < quantum_threshold)
- pixel.opacity=(MagickRealType) GetOpacityPixelComponent(p);
+ pixel.opacity=(MagickRealType) GetPixelOpacity(p);
else
- pixel.opacity=GetOpacityPixelComponent(p)+(pixel.opacity*amount);
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ pixel.opacity=GetPixelOpacity(p)+(pixel.opacity*amount);
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
}
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
{
- pixel.index=GetIndexPixelComponent(indexes+x)-(MagickRealType)
- GetIndexPixelComponent(unsharp_indexes+x);
+ pixel.index=GetPixelIndex(indexes+x)-(MagickRealType)
+ GetPixelIndex(unsharp_indexes+x);
if (fabs(2.0*pixel.index) < quantum_threshold)
- pixel.index=(MagickRealType) GetIndexPixelComponent(indexes+x);
+ pixel.index=(MagickRealType) GetPixelIndex(indexes+x);
else
- pixel.index=(MagickRealType) GetIndexPixelComponent(indexes+x)+
+ pixel.index=(MagickRealType) GetPixelIndex(indexes+x)+
(pixel.index*amount);
- SetIndexPixelComponent(unsharp_indexes+x,ClampToQuantum(pixel.index));
+ SetPixelIndex(unsharp_indexes+x,ClampToQuantum(pixel.index));
}
p++;
q++;
diff --git a/magick/enhance.c b/magick/enhance.c
index bbb7611..6320a6e 100644
--- a/magick/enhance.c
+++ b/magick/enhance.c
@@ -658,14 +658,14 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- luma=0.2126*GetRedPixelComponent(q)+0.7152*GetGreenPixelComponent(q)+
- 0.0722*GetBluePixelComponent(q);
- SetRedPixelComponent(q,ClampToQuantum(luma+color_correction.saturation*
- (cdl_map[ScaleQuantumToMap(GetRedPixelComponent(q))].red-luma)));
- SetGreenPixelComponent(q,ClampToQuantum(luma+color_correction.saturation*
- (cdl_map[ScaleQuantumToMap(GetGreenPixelComponent(q))].green-luma)));
- SetBluePixelComponent(q,ClampToQuantum(luma+color_correction.saturation*
- (cdl_map[ScaleQuantumToMap(GetBluePixelComponent(q))].blue-luma)));
+ luma=0.2126*GetPixelRed(q)+0.7152*GetPixelGreen(q)+
+ 0.0722*GetPixelBlue(q);
+ SetPixelRed(q,ClampToQuantum(luma+color_correction.saturation*
+ (cdl_map[ScaleQuantumToMap(GetPixelRed(q))].red-luma)));
+ SetPixelGreen(q,ClampToQuantum(luma+color_correction.saturation*
+ (cdl_map[ScaleQuantumToMap(GetPixelGreen(q))].green-luma)));
+ SetPixelBlue(q,ClampToQuantum(luma+color_correction.saturation*
+ (cdl_map[ScaleQuantumToMap(GetPixelBlue(q))].blue-luma)));
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -831,31 +831,31 @@
{
SetMagickPixelPacket(image,q,indexes+x,&pixel);
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampRedPixelComponent(clut_map+
- ScaleQuantumToMap(GetRedPixelComponent(q))));
+ SetPixelRed(q,ClampPixelRed(clut_map+
+ ScaleQuantumToMap(GetPixelRed(q))));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampGreenPixelComponent(clut_map+
- ScaleQuantumToMap(GetGreenPixelComponent(q))));
+ SetPixelGreen(q,ClampPixelGreen(clut_map+
+ ScaleQuantumToMap(GetPixelGreen(q))));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampBluePixelComponent(clut_map+
- ScaleQuantumToMap(GetBluePixelComponent(q))));
+ SetPixelBlue(q,ClampPixelBlue(clut_map+
+ ScaleQuantumToMap(GetPixelBlue(q))));
if ((channel & OpacityChannel) != 0)
{
if (clut_image->matte == MagickFalse)
- SetAlphaPixelComponent(q,MagickPixelIntensityToQuantum(clut_map+
- ScaleQuantumToMap((Quantum) GetAlphaPixelComponent(q))));
+ SetPixelAlpha(q,MagickPixelIntensityToQuantum(clut_map+
+ ScaleQuantumToMap((Quantum) GetPixelAlpha(q))));
else
if (image->matte == MagickFalse)
- SetOpacityPixelComponent(q,ClampOpacityPixelComponent(clut_map+
+ SetPixelOpacity(q,ClampPixelOpacity(clut_map+
ScaleQuantumToMap((Quantum) MagickPixelIntensity(&pixel))));
else
- SetOpacityPixelComponent(q,ClampOpacityPixelComponent(
- clut_map+ScaleQuantumToMap(GetOpacityPixelComponent(q))));
+ SetPixelOpacity(q,ClampPixelOpacity(
+ clut_map+ScaleQuantumToMap(GetPixelOpacity(q))));
}
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(indexes+x,ClampToQuantum((clut_map+(ssize_t)
- GetIndexPixelComponent(indexes+x))->index));
+ SetPixelIndex(indexes+x,ClampToQuantum((clut_map+(ssize_t)
+ GetPixelIndex(indexes+x))->index));
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -1008,13 +1008,13 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- red=GetRedPixelComponent(q);
- green=GetGreenPixelComponent(q);
- blue=GetBluePixelComponent(q);
+ red=GetPixelRed(q);
+ green=GetPixelGreen(q);
+ blue=GetPixelBlue(q);
Contrast(sign,&red,&green,&blue);
- SetRedPixelComponent(q,red);
- SetGreenPixelComponent(q,green);
- SetBluePixelComponent(q,blue);
+ SetPixelRed(q,red);
+ SetPixelGreen(q,green);
+ SetPixelBlue(q,blue);
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -1207,16 +1207,16 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- histogram[ScaleQuantumToMap(GetRedPixelComponent(p))].red++;
+ histogram[ScaleQuantumToMap(GetPixelRed(p))].red++;
if ((channel & GreenChannel) != 0)
- histogram[ScaleQuantumToMap(GetGreenPixelComponent(p))].green++;
+ histogram[ScaleQuantumToMap(GetPixelGreen(p))].green++;
if ((channel & BlueChannel) != 0)
- histogram[ScaleQuantumToMap(GetBluePixelComponent(p))].blue++;
+ histogram[ScaleQuantumToMap(GetPixelBlue(p))].blue++;
if ((channel & OpacityChannel) != 0)
- histogram[ScaleQuantumToMap(GetOpacityPixelComponent(p))].opacity++;
+ histogram[ScaleQuantumToMap(GetPixelOpacity(p))].opacity++;
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- histogram[ScaleQuantumToMap(GetIndexPixelComponent(
+ histogram[ScaleQuantumToMap(GetPixelIndex(
indexes+x))].index++;
p++;
}
@@ -1480,33 +1480,33 @@
if ((channel & RedChannel) != 0)
{
if (black.red != white.red)
- SetRedPixelComponent(q,ClampToQuantum(stretch_map[
- ScaleQuantumToMap(GetRedPixelComponent(q))].red));
+ SetPixelRed(q,ClampToQuantum(stretch_map[
+ ScaleQuantumToMap(GetPixelRed(q))].red));
}
if ((channel & GreenChannel) != 0)
{
if (black.green != white.green)
- SetGreenPixelComponent(q,ClampToQuantum(stretch_map[
- ScaleQuantumToMap(GetGreenPixelComponent(q))].green));
+ SetPixelGreen(q,ClampToQuantum(stretch_map[
+ ScaleQuantumToMap(GetPixelGreen(q))].green));
}
if ((channel & BlueChannel) != 0)
{
if (black.blue != white.blue)
- SetBluePixelComponent(q,ClampToQuantum(stretch_map[
- ScaleQuantumToMap(GetBluePixelComponent(q))].blue));
+ SetPixelBlue(q,ClampToQuantum(stretch_map[
+ ScaleQuantumToMap(GetPixelBlue(q))].blue));
}
if ((channel & OpacityChannel) != 0)
{
if (black.opacity != white.opacity)
- SetOpacityPixelComponent(q,ClampToQuantum(stretch_map[
- ScaleQuantumToMap(GetOpacityPixelComponent(q))].opacity));
+ SetPixelOpacity(q,ClampToQuantum(stretch_map[
+ ScaleQuantumToMap(GetPixelOpacity(q))].opacity));
}
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
{
if (black.index != white.index)
- SetIndexPixelComponent(indexes+x,ClampToQuantum(stretch_map[
- ScaleQuantumToMap(GetIndexPixelComponent(indexes+x))].index));
+ SetPixelIndex(indexes+x,ClampToQuantum(stretch_map[
+ ScaleQuantumToMap(GetPixelIndex(indexes+x))].index));
}
q++;
}
@@ -1559,16 +1559,16 @@
MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception)
{
#define Enhance(weight) \
- mean=((MagickRealType) GetRedPixelComponent(r)+pixel.red)/2; \
- distance=(MagickRealType) GetRedPixelComponent(r)-(MagickRealType) pixel.red; \
+ mean=((MagickRealType) GetPixelRed(r)+pixel.red)/2; \
+ distance=(MagickRealType) GetPixelRed(r)-(MagickRealType) pixel.red; \
distance_squared=QuantumScale*(2.0*((MagickRealType) QuantumRange+1.0)+ \
mean)*distance*distance; \
- mean=((MagickRealType) GetGreenPixelComponent(r)+pixel.green)/2; \
- distance=(MagickRealType) GetGreenPixelComponent(r)-(MagickRealType) \
+ mean=((MagickRealType) GetPixelGreen(r)+pixel.green)/2; \
+ distance=(MagickRealType) GetPixelGreen(r)-(MagickRealType) \
pixel.green; \
distance_squared+=4.0*distance*distance; \
- mean=((MagickRealType) GetBluePixelComponent(r)+pixel.blue)/2; \
- distance=(MagickRealType) GetBluePixelComponent(r)-(MagickRealType) \
+ mean=((MagickRealType) GetPixelBlue(r)+pixel.blue)/2; \
+ distance=(MagickRealType) GetPixelBlue(r)-(MagickRealType) \
pixel.blue; \
distance_squared+=QuantumScale*(3.0*((MagickRealType) \
QuantumRange+1.0)-1.0-mean)*distance*distance; \
@@ -1579,10 +1579,10 @@
if (distance_squared < ((MagickRealType) QuantumRange*(MagickRealType) \
QuantumRange/25.0f)) \
{ \
- aggregate.red+=(weight)*GetRedPixelComponent(r); \
- aggregate.green+=(weight)*GetGreenPixelComponent(r); \
- aggregate.blue+=(weight)*GetBluePixelComponent(r); \
- aggregate.opacity+=(weight)*GetOpacityPixelComponent(r); \
+ aggregate.red+=(weight)*GetPixelRed(r); \
+ aggregate.green+=(weight)*GetPixelGreen(r); \
+ aggregate.blue+=(weight)*GetPixelBlue(r); \
+ aggregate.opacity+=(weight)*GetPixelOpacity(r); \
total_weight+=(weight); \
} \
r++;
@@ -1697,11 +1697,11 @@
Enhance(8.0); Enhance(20.0); Enhance(40.0); Enhance(20.0); Enhance(8.0);
r=p+4*(image->columns+4);
Enhance(5.0); Enhance(8.0); Enhance(10.0); Enhance(8.0); Enhance(5.0);
- SetRedPixelComponent(q,(aggregate.red+(total_weight/2)-1)/total_weight);
- SetGreenPixelComponent(q,(aggregate.green+(total_weight/2)-1)/
+ SetPixelRed(q,(aggregate.red+(total_weight/2)-1)/total_weight);
+ SetPixelGreen(q,(aggregate.green+(total_weight/2)-1)/
total_weight);
- SetBluePixelComponent(q,(aggregate.blue+(total_weight/2)-1)/total_weight);
- SetOpacityPixelComponent(q,(aggregate.opacity+(total_weight/2)-1)/
+ SetPixelBlue(q,(aggregate.blue+(total_weight/2)-1)/total_weight);
+ SetPixelOpacity(q,(aggregate.opacity+(total_weight/2)-1)/
total_weight);
p++;
q++;
@@ -1837,16 +1837,16 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- histogram[ScaleQuantumToMap(GetRedPixelComponent(p))].red++;
+ histogram[ScaleQuantumToMap(GetPixelRed(p))].red++;
if ((channel & GreenChannel) != 0)
- histogram[ScaleQuantumToMap(GetGreenPixelComponent(p))].green++;
+ histogram[ScaleQuantumToMap(GetPixelGreen(p))].green++;
if ((channel & BlueChannel) != 0)
- histogram[ScaleQuantumToMap(GetBluePixelComponent(p))].blue++;
+ histogram[ScaleQuantumToMap(GetPixelBlue(p))].blue++;
if ((channel & OpacityChannel) != 0)
- histogram[ScaleQuantumToMap(GetOpacityPixelComponent(p))].opacity++;
+ histogram[ScaleQuantumToMap(GetPixelOpacity(p))].opacity++;
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- histogram[ScaleQuantumToMap(GetIndexPixelComponent(indexes+x))].index++;
+ histogram[ScaleQuantumToMap(GetPixelIndex(indexes+x))].index++;
p++;
}
}
@@ -1956,22 +1956,22 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if (((channel & RedChannel) != 0) && (white.red != black.red))
- SetRedPixelComponent(q,ClampToQuantum(equalize_map[
- ScaleQuantumToMap(GetRedPixelComponent(q))].red));
+ SetPixelRed(q,ClampToQuantum(equalize_map[
+ ScaleQuantumToMap(GetPixelRed(q))].red));
if (((channel & GreenChannel) != 0) && (white.green != black.green))
- SetGreenPixelComponent(q,ClampToQuantum(equalize_map[
- ScaleQuantumToMap(GetGreenPixelComponent(q))].green));
+ SetPixelGreen(q,ClampToQuantum(equalize_map[
+ ScaleQuantumToMap(GetPixelGreen(q))].green));
if (((channel & BlueChannel) != 0) && (white.blue != black.blue))
- SetBluePixelComponent(q,ClampToQuantum(equalize_map[
- ScaleQuantumToMap(GetBluePixelComponent(q))].blue));
+ SetPixelBlue(q,ClampToQuantum(equalize_map[
+ ScaleQuantumToMap(GetPixelBlue(q))].blue));
if (((channel & OpacityChannel) != 0) && (white.opacity != black.opacity))
- SetOpacityPixelComponent(q,ClampToQuantum(equalize_map[
- ScaleQuantumToMap(GetOpacityPixelComponent(q))].opacity));
+ SetPixelOpacity(q,ClampToQuantum(equalize_map[
+ ScaleQuantumToMap(GetPixelOpacity(q))].opacity));
if ((((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace)) &&
(white.index != black.index))
- SetIndexPixelComponent(indexes+x,ClampToQuantum(equalize_map[
- ScaleQuantumToMap(GetIndexPixelComponent(indexes+x))].index));
+ SetPixelIndex(indexes+x,ClampToQuantum(equalize_map[
+ ScaleQuantumToMap(GetPixelIndex(indexes+x))].index));
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -2183,32 +2183,32 @@
{
if (channel == DefaultChannels)
{
- SetRedPixelComponent(q,gamma_map[ScaleQuantumToMap(
- GetRedPixelComponent(q))]);
- SetGreenPixelComponent(q,gamma_map[ScaleQuantumToMap(
- GetGreenPixelComponent(q))]);
- SetBluePixelComponent(q,gamma_map[ScaleQuantumToMap(
- GetBluePixelComponent(q))]);
+ SetPixelRed(q,gamma_map[ScaleQuantumToMap(
+ GetPixelRed(q))]);
+ SetPixelGreen(q,gamma_map[ScaleQuantumToMap(
+ GetPixelGreen(q))]);
+ SetPixelBlue(q,gamma_map[ScaleQuantumToMap(
+ GetPixelBlue(q))]);
}
else
{
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,gamma_map[ScaleQuantumToMap(
- GetRedPixelComponent(q))]);
+ SetPixelRed(q,gamma_map[ScaleQuantumToMap(
+ GetPixelRed(q))]);
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,gamma_map[ScaleQuantumToMap(
- GetGreenPixelComponent(q))]);
+ SetPixelGreen(q,gamma_map[ScaleQuantumToMap(
+ GetPixelGreen(q))]);
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,gamma_map[ScaleQuantumToMap(
- GetBluePixelComponent(q))]);
+ SetPixelBlue(q,gamma_map[ScaleQuantumToMap(
+ GetPixelBlue(q))]);
if ((channel & OpacityChannel) != 0)
{
if (image->matte == MagickFalse)
- SetOpacityPixelComponent(q,gamma_map[ScaleQuantumToMap(
- GetOpacityPixelComponent(q))]);
+ SetPixelOpacity(q,gamma_map[ScaleQuantumToMap(
+ GetPixelOpacity(q))]);
else
- SetAlphaPixelComponent(q,gamma_map[ScaleQuantumToMap((Quantum)
- GetAlphaPixelComponent(q))]);
+ SetPixelAlpha(q,gamma_map[ScaleQuantumToMap((Quantum)
+ GetPixelAlpha(q))]);
}
}
q++;
@@ -2216,8 +2216,8 @@
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
for (x=0; x < (ssize_t) image->columns; x++)
- SetIndexPixelComponent(indexes+x,gamma_map[ScaleQuantumToMap(
- GetIndexPixelComponent(indexes+x))]);
+ SetPixelIndex(indexes+x,gamma_map[ScaleQuantumToMap(
+ GetPixelIndex(indexes+x))]);
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
if (image->progress_monitor != (MagickProgressMonitor) NULL)
@@ -2394,9 +2394,9 @@
pixel4=zero;
for (x=0; x < (ssize_t) image->columns; x++)
{
- point.x=QuantumScale*(level-1.0)*GetRedPixelComponent(q);
- point.y=QuantumScale*(level-1.0)*GetGreenPixelComponent(q);
- point.z=QuantumScale*(level-1.0)*GetBluePixelComponent(q);
+ point.x=QuantumScale*(level-1.0)*GetPixelRed(q);
+ point.y=QuantumScale*(level-1.0)*GetPixelGreen(q);
+ point.z=QuantumScale*(level-1.0)*GetPixelBlue(q);
offset=point.x+level*floor(point.y)+cube_size*floor(point.z);
point.x-=floor(point.x);
point.y-=floor(point.y);
@@ -2421,16 +2421,16 @@
MagickPixelCompositeAreaBlend(&pixel3,pixel3.opacity,&pixel4,
pixel4.opacity,point.z,&pixel);
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(pixel.red));
+ SetPixelRed(q,ClampToQuantum(pixel.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
+ SetPixelGreen(q,ClampToQuantum(pixel.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+ SetPixelBlue(q,ClampToQuantum(pixel.blue));
if (((channel & OpacityChannel) != 0) && (image->matte != MagickFalse))
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel.index));
+ SetPixelIndex(indexes+x,ClampToQuantum(pixel.index));
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -2668,18 +2668,18 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,LevelQuantum(GetRedPixelComponent(q)));
+ SetPixelRed(q,LevelQuantum(GetPixelRed(q)));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,LevelQuantum(GetGreenPixelComponent(q)));
+ SetPixelGreen(q,LevelQuantum(GetPixelGreen(q)));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,LevelQuantum(GetBluePixelComponent(q)));
+ SetPixelBlue(q,LevelQuantum(GetPixelBlue(q)));
if (((channel & OpacityChannel) != 0) &&
(image->matte == MagickTrue))
- SetAlphaPixelComponent(q,LevelQuantum(GetAlphaPixelComponent(q)));
+ SetPixelAlpha(q,LevelQuantum(GetPixelAlpha(q)));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(indexes+x,LevelQuantum(
- GetIndexPixelComponent(indexes+x)));
+ SetPixelIndex(indexes+x,LevelQuantum(
+ GetPixelIndex(indexes+x)));
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -2840,18 +2840,18 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,LevelizeValue(GetRedPixelComponent(q)));
+ SetPixelRed(q,LevelizeValue(GetPixelRed(q)));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,LevelizeValue(GetGreenPixelComponent(q)));
+ SetPixelGreen(q,LevelizeValue(GetPixelGreen(q)));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,LevelizeValue(GetBluePixelComponent(q)));
+ SetPixelBlue(q,LevelizeValue(GetPixelBlue(q)));
if (((channel & OpacityChannel) != 0) &&
(image->matte == MagickTrue))
- SetOpacityPixelComponent(q,LevelizeValue(GetOpacityPixelComponent(q)));
+ SetPixelOpacity(q,LevelizeValue(GetPixelOpacity(q)));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(indexes+x,LevelizeValue(
- GetIndexPixelComponent(indexes+x)));
+ SetPixelIndex(indexes+x,LevelizeValue(
+ GetPixelIndex(indexes+x)));
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -3326,9 +3326,9 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- red=GetRedPixelComponent(q);
- green=GetGreenPixelComponent(q);
- blue=GetBluePixelComponent(q);
+ red=GetPixelRed(q);
+ green=GetPixelGreen(q);
+ blue=GetPixelBlue(q);
switch (colorspace)
{
case HSBColorspace:
@@ -3351,9 +3351,9 @@
break;
}
}
- SetRedPixelComponent(q,red);
- SetGreenPixelComponent(q,green);
- SetBluePixelComponent(q,blue);
+ SetPixelRed(q,red);
+ SetPixelGreen(q,green);
+ SetPixelBlue(q,blue);
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -3506,25 +3506,25 @@
indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetRedPixelComponent(q) != GetGreenPixelComponent(q)) ||
- (GetGreenPixelComponent(q) != GetBluePixelComponent(q)))
+ if ((GetPixelRed(q) != GetPixelGreen(q)) ||
+ (GetPixelGreen(q) != GetPixelBlue(q)))
{
q++;
continue;
}
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,QuantumRange-GetRedPixelComponent(q));
+ SetPixelRed(q,QuantumRange-GetPixelRed(q));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,QuantumRange-GetGreenPixelComponent(q));
+ SetPixelGreen(q,QuantumRange-GetPixelGreen(q));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,QuantumRange-GetBluePixelComponent(q));
+ SetPixelBlue(q,QuantumRange-GetPixelBlue(q));
if ((channel & OpacityChannel) != 0)
- SetOpacityPixelComponent(q,QuantumRange-
- GetOpacityPixelComponent(q));
+ SetPixelOpacity(q,QuantumRange-
+ GetPixelOpacity(q));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(indexes+x,QuantumRange-
- GetIndexPixelComponent(indexes+x));
+ SetPixelIndex(indexes+x,QuantumRange-
+ GetPixelIndex(indexes+x));
q++;
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -3576,17 +3576,17 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,QuantumRange-GetRedPixelComponent(q));
+ SetPixelRed(q,QuantumRange-GetPixelRed(q));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,QuantumRange-GetGreenPixelComponent(q));
+ SetPixelGreen(q,QuantumRange-GetPixelGreen(q));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,QuantumRange-GetBluePixelComponent(q));
+ SetPixelBlue(q,QuantumRange-GetPixelBlue(q));
if ((channel & OpacityChannel) != 0)
- SetOpacityPixelComponent(q,QuantumRange-GetOpacityPixelComponent(q));
+ SetPixelOpacity(q,QuantumRange-GetPixelOpacity(q));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(indexes+x,QuantumRange-
- GetIndexPixelComponent(indexes+x));
+ SetPixelIndex(indexes+x,QuantumRange-
+ GetPixelIndex(indexes+x));
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -3845,21 +3845,21 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
- GetRedPixelComponent(q))]));
+ SetPixelRed(q,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
+ GetPixelRed(q))]));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
- GetGreenPixelComponent(q))]));
+ SetPixelGreen(q,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
+ GetPixelGreen(q))]));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
- GetBluePixelComponent(q))]));
+ SetPixelBlue(q,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
+ GetPixelBlue(q))]));
if ((channel & OpacityChannel) != 0)
- SetOpacityPixelComponent(q,ClampToQuantum(sigmoidal_map[
- ScaleQuantumToMap(GetOpacityPixelComponent(q))]));
+ SetPixelOpacity(q,ClampToQuantum(sigmoidal_map[
+ ScaleQuantumToMap(GetPixelOpacity(q))]));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(indexes+x,ClampToQuantum(sigmoidal_map[
- ScaleQuantumToMap(GetIndexPixelComponent(indexes+x))]));
+ SetPixelIndex(indexes+x,ClampToQuantum(sigmoidal_map[
+ ScaleQuantumToMap(GetPixelIndex(indexes+x))]));
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
diff --git a/magick/feature.c b/magick/feature.c
index 57c3a1c..6605ba4 100644
--- a/magick/feature.c
+++ b/magick/feature.c
@@ -247,18 +247,18 @@
indexes=GetCacheViewVirtualIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- grays[ScaleQuantumToMap(GetRedPixelComponent(p))].red=
- ScaleQuantumToMap(GetRedPixelComponent(p));
- grays[ScaleQuantumToMap(GetGreenPixelComponent(p))].green=
- ScaleQuantumToMap(GetGreenPixelComponent(p));
- grays[ScaleQuantumToMap(GetBluePixelComponent(p))].blue=
- ScaleQuantumToMap(GetBluePixelComponent(p));
+ grays[ScaleQuantumToMap(GetPixelRed(p))].red=
+ ScaleQuantumToMap(GetPixelRed(p));
+ grays[ScaleQuantumToMap(GetPixelGreen(p))].green=
+ ScaleQuantumToMap(GetPixelGreen(p));
+ grays[ScaleQuantumToMap(GetPixelBlue(p))].blue=
+ ScaleQuantumToMap(GetPixelBlue(p));
if (image->colorspace == CMYKColorspace)
- grays[ScaleQuantumToMap(GetIndexPixelComponent(indexes+x))].index=
- ScaleQuantumToMap(GetIndexPixelComponent(indexes+x));
+ grays[ScaleQuantumToMap(GetPixelIndex(indexes+x))].index=
+ ScaleQuantumToMap(GetPixelIndex(indexes+x));
if (image->matte != MagickFalse)
- grays[ScaleQuantumToMap(GetOpacityPixelComponent(p))].opacity=
- ScaleQuantumToMap(GetOpacityPixelComponent(p));
+ grays[ScaleQuantumToMap(GetPixelOpacity(p))].opacity=
+ ScaleQuantumToMap(GetPixelOpacity(p));
p++;
}
}
@@ -471,23 +471,23 @@
}
u=0;
v=0;
- while (grays[u].red != ScaleQuantumToMap(GetRedPixelComponent(p)))
+ while (grays[u].red != ScaleQuantumToMap(GetPixelRed(p)))
u++;
- while (grays[v].red != ScaleQuantumToMap(GetRedPixelComponent(p+offset)))
+ while (grays[v].red != ScaleQuantumToMap(GetPixelRed(p+offset)))
v++;
cooccurrence[u][v].direction[i].red++;
cooccurrence[v][u].direction[i].red++;
u=0;
v=0;
- while (grays[u].green != ScaleQuantumToMap(GetGreenPixelComponent(p)))
+ while (grays[u].green != ScaleQuantumToMap(GetPixelGreen(p)))
u++;
- while (grays[v].green != ScaleQuantumToMap(GetGreenPixelComponent(p+offset)))
+ while (grays[v].green != ScaleQuantumToMap(GetPixelGreen(p+offset)))
v++;
cooccurrence[u][v].direction[i].green++;
cooccurrence[v][u].direction[i].green++;
u=0;
v=0;
- while (grays[u].blue != ScaleQuantumToMap(GetBluePixelComponent(p)))
+ while (grays[u].blue != ScaleQuantumToMap(GetPixelBlue(p)))
u++;
while (grays[v].blue != ScaleQuantumToMap((p+offset)->blue))
v++;
@@ -497,9 +497,9 @@
{
u=0;
v=0;
- while (grays[u].index != ScaleQuantumToMap(GetIndexPixelComponent(indexes+x)))
+ while (grays[u].index != ScaleQuantumToMap(GetPixelIndex(indexes+x)))
u++;
- while (grays[v].index != ScaleQuantumToMap(GetIndexPixelComponent(indexes+x+offset)))
+ while (grays[v].index != ScaleQuantumToMap(GetPixelIndex(indexes+x+offset)))
v++;
cooccurrence[u][v].direction[i].index++;
cooccurrence[v][u].direction[i].index++;
@@ -508,7 +508,7 @@
{
u=0;
v=0;
- while (grays[u].opacity != ScaleQuantumToMap(GetOpacityPixelComponent(p)))
+ while (grays[u].opacity != ScaleQuantumToMap(GetPixelOpacity(p)))
u++;
while (grays[v].opacity != ScaleQuantumToMap((p+offset)->opacity))
v++;
diff --git a/magick/fourier.c b/magick/fourier.c
index a60354d..142e774 100644
--- a/magick/fourier.c
+++ b/magick/fourier.c
@@ -305,37 +305,37 @@
case RedChannel:
default:
{
- SetRedPixelComponent(q,ClampToQuantum(QuantumRange*
+ SetPixelRed(q,ClampToQuantum(QuantumRange*
magnitude_source[i]));
break;
}
case GreenChannel:
{
- SetGreenPixelComponent(q,ClampToQuantum(QuantumRange*
+ SetPixelGreen(q,ClampToQuantum(QuantumRange*
magnitude_source[i]));
break;
}
case BlueChannel:
{
- SetBluePixelComponent(q,ClampToQuantum(QuantumRange*
+ SetPixelBlue(q,ClampToQuantum(QuantumRange*
magnitude_source[i]));
break;
}
case OpacityChannel:
{
- SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange*
+ SetPixelOpacity(q,ClampToQuantum(QuantumRange*
magnitude_source[i]));
break;
}
case IndexChannel:
{
- SetIndexPixelComponent(indexes+x,ClampToQuantum(QuantumRange*
+ SetPixelIndex(indexes+x,ClampToQuantum(QuantumRange*
magnitude_source[i]));
break;
}
case GrayChannels:
{
- SetGrayPixelComponent(q,ClampToQuantum(QuantumRange*
+ SetPixelGray(q,ClampToQuantum(QuantumRange*
magnitude_source[i]));
break;
}
@@ -362,37 +362,37 @@
case RedChannel:
default:
{
- SetRedPixelComponent(q,ClampToQuantum(QuantumRange*
+ SetPixelRed(q,ClampToQuantum(QuantumRange*
phase_source[i]));
break;
}
case GreenChannel:
{
- SetGreenPixelComponent(q,ClampToQuantum(QuantumRange*
+ SetPixelGreen(q,ClampToQuantum(QuantumRange*
phase_source[i]));
break;
}
case BlueChannel:
{
- SetBluePixelComponent(q,ClampToQuantum(QuantumRange*
+ SetPixelBlue(q,ClampToQuantum(QuantumRange*
phase_source[i]));
break;
}
case OpacityChannel:
{
- SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange*
+ SetPixelOpacity(q,ClampToQuantum(QuantumRange*
phase_source[i]));
break;
}
case IndexChannel:
{
- SetIndexPixelComponent(indexes+x,ClampToQuantum(QuantumRange*
+ SetPixelIndex(indexes+x,ClampToQuantum(QuantumRange*
phase_source[i]));
break;
}
case GrayChannels:
{
- SetGrayPixelComponent(q,ClampToQuantum(QuantumRange*phase_source[i]));
+ SetPixelGray(q,ClampToQuantum(QuantumRange*phase_source[i]));
break;
}
}
@@ -468,32 +468,32 @@
case RedChannel:
default:
{
- source[i]=QuantumScale*GetRedPixelComponent(p);
+ source[i]=QuantumScale*GetPixelRed(p);
break;
}
case GreenChannel:
{
- source[i]=QuantumScale*GetGreenPixelComponent(p);
+ source[i]=QuantumScale*GetPixelGreen(p);
break;
}
case BlueChannel:
{
- source[i]=QuantumScale*GetBluePixelComponent(p);
+ source[i]=QuantumScale*GetPixelBlue(p);
break;
}
case OpacityChannel:
{
- source[i]=QuantumScale*GetOpacityPixelComponent(p);
+ source[i]=QuantumScale*GetPixelOpacity(p);
break;
}
case IndexChannel:
{
- source[i]=QuantumScale*GetIndexPixelComponent(indexes+x);
+ source[i]=QuantumScale*GetPixelIndex(indexes+x);
break;
}
case GrayChannels:
{
- source[i]=QuantumScale*GetGrayPixelComponent(p);
+ source[i]=QuantumScale*GetPixelGray(p);
break;
}
}
@@ -893,32 +893,32 @@
case RedChannel:
default:
{
- magnitude_source[i]=QuantumScale*GetRedPixelComponent(p);
+ magnitude_source[i]=QuantumScale*GetPixelRed(p);
break;
}
case GreenChannel:
{
- magnitude_source[i]=QuantumScale*GetGreenPixelComponent(p);
+ magnitude_source[i]=QuantumScale*GetPixelGreen(p);
break;
}
case BlueChannel:
{
- magnitude_source[i]=QuantumScale*GetBluePixelComponent(p);
+ magnitude_source[i]=QuantumScale*GetPixelBlue(p);
break;
}
case OpacityChannel:
{
- magnitude_source[i]=QuantumScale*GetOpacityPixelComponent(p);
+ magnitude_source[i]=QuantumScale*GetPixelOpacity(p);
break;
}
case IndexChannel:
{
- magnitude_source[i]=QuantumScale*GetIndexPixelComponent(indexes+x);
+ magnitude_source[i]=QuantumScale*GetPixelIndex(indexes+x);
break;
}
case GrayChannels:
{
- magnitude_source[i]=QuantumScale*GetGrayPixelComponent(p);
+ magnitude_source[i]=QuantumScale*GetPixelGray(p);
break;
}
}
@@ -942,32 +942,32 @@
case RedChannel:
default:
{
- phase_source[i]=QuantumScale*GetRedPixelComponent(p);
+ phase_source[i]=QuantumScale*GetPixelRed(p);
break;
}
case GreenChannel:
{
- phase_source[i]=QuantumScale*GetGreenPixelComponent(p);
+ phase_source[i]=QuantumScale*GetPixelGreen(p);
break;
}
case BlueChannel:
{
- phase_source[i]=QuantumScale*GetBluePixelComponent(p);
+ phase_source[i]=QuantumScale*GetPixelBlue(p);
break;
}
case OpacityChannel:
{
- phase_source[i]=QuantumScale*GetOpacityPixelComponent(p);
+ phase_source[i]=QuantumScale*GetPixelOpacity(p);
break;
}
case IndexChannel:
{
- phase_source[i]=QuantumScale*GetIndexPixelComponent(indexes+x);
+ phase_source[i]=QuantumScale*GetPixelIndex(indexes+x);
break;
}
case GrayChannels:
{
- phase_source[i]=QuantumScale*GetGrayPixelComponent(p);
+ phase_source[i]=QuantumScale*GetPixelGray(p);
break;
}
}
@@ -1110,33 +1110,33 @@
case RedChannel:
default:
{
- SetRedPixelComponent(q,ClampToQuantum(QuantumRange*source[i]));
+ SetPixelRed(q,ClampToQuantum(QuantumRange*source[i]));
break;
}
case GreenChannel:
{
- SetGreenPixelComponent(q,ClampToQuantum(QuantumRange*source[i]));
+ SetPixelGreen(q,ClampToQuantum(QuantumRange*source[i]));
break;
}
case BlueChannel:
{
- SetBluePixelComponent(q,ClampToQuantum(QuantumRange*source[i]));
+ SetPixelBlue(q,ClampToQuantum(QuantumRange*source[i]));
break;
}
case OpacityChannel:
{
- SetOpacityPixelComponent(q,ClampToQuantum(QuantumRange*source[i]));
+ SetPixelOpacity(q,ClampToQuantum(QuantumRange*source[i]));
break;
}
case IndexChannel:
{
- SetIndexPixelComponent(indexes+x,ClampToQuantum(QuantumRange*
+ SetPixelIndex(indexes+x,ClampToQuantum(QuantumRange*
source[i]));
break;
}
case GrayChannels:
{
- SetGrayPixelComponent(q,ClampToQuantum(QuantumRange*source[i]));
+ SetPixelGray(q,ClampToQuantum(QuantumRange*source[i]));
break;
}
}
diff --git a/magick/fx.c b/magick/fx.c
index a878802..e5a6913 100644
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -414,21 +414,21 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(GenerateDifferentialNoise(
- random_info[id],GetRedPixelComponent(p),noise_type,attenuate)));
+ SetPixelRed(q,ClampToQuantum(GenerateDifferentialNoise(
+ random_info[id],GetPixelRed(p),noise_type,attenuate)));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(GenerateDifferentialNoise(
- random_info[id],GetGreenPixelComponent(p),noise_type,attenuate)));
+ SetPixelGreen(q,ClampToQuantum(GenerateDifferentialNoise(
+ random_info[id],GetPixelGreen(p),noise_type,attenuate)));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(GenerateDifferentialNoise(
- random_info[id],GetBluePixelComponent(p),noise_type,attenuate)));
+ SetPixelBlue(q,ClampToQuantum(GenerateDifferentialNoise(
+ random_info[id],GetPixelBlue(p),noise_type,attenuate)));
if ((channel & OpacityChannel) != 0)
- SetOpacityPixelComponent(q,ClampToQuantum(GenerateDifferentialNoise(
- random_info[id],GetOpacityPixelComponent(p),noise_type,attenuate)));
+ SetPixelOpacity(q,ClampToQuantum(GenerateDifferentialNoise(
+ random_info[id],GetPixelOpacity(p),noise_type,attenuate)));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(noise_indexes+x,ClampToQuantum(
- GenerateDifferentialNoise(random_info[id],GetIndexPixelComponent(
+ SetPixelIndex(noise_indexes+x,ClampToQuantum(
+ GenerateDifferentialNoise(random_info[id],GetPixelIndex(
indexes+x),noise_type,attenuate)));
p++;
q++;
@@ -568,25 +568,25 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- quantum=GetRedPixelComponent(p);
- if (GetGreenPixelComponent(p) < quantum)
- quantum=GetGreenPixelComponent(p);
- if (GetBluePixelComponent(p) < quantum)
- quantum=GetBluePixelComponent(p);
- pixel.red=0.5*(GetRedPixelComponent(p)+factor*quantum);
- pixel.green=0.5*(GetGreenPixelComponent(p)+factor*quantum);
- pixel.blue=0.5*(GetBluePixelComponent(p)+factor*quantum);
- quantum=GetRedPixelComponent(p);
- if (GetGreenPixelComponent(p) > quantum)
- quantum=GetGreenPixelComponent(p);
- if (GetBluePixelComponent(p) > quantum)
- quantum=GetBluePixelComponent(p);
+ quantum=GetPixelRed(p);
+ if (GetPixelGreen(p) < quantum)
+ quantum=GetPixelGreen(p);
+ if (GetPixelBlue(p) < quantum)
+ quantum=GetPixelBlue(p);
+ pixel.red=0.5*(GetPixelRed(p)+factor*quantum);
+ pixel.green=0.5*(GetPixelGreen(p)+factor*quantum);
+ pixel.blue=0.5*(GetPixelBlue(p)+factor*quantum);
+ quantum=GetPixelRed(p);
+ if (GetPixelGreen(p) > quantum)
+ quantum=GetPixelGreen(p);
+ if (GetPixelBlue(p) > quantum)
+ quantum=GetPixelBlue(p);
pixel.red=0.5*(pixel.red+factor*quantum);
pixel.green=0.5*(pixel.green+factor*quantum);
pixel.blue=0.5*(pixel.blue+factor*quantum);
- SetRedPixelComponent(q,ClampToQuantum(pixel.red));
- SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
- SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
+ SetPixelRed(q,ClampToQuantum(pixel.red));
+ SetPixelGreen(q,ClampToQuantum(pixel.green));
+ SetPixelBlue(q,ClampToQuantum(pixel.blue));
p++;
q++;
}
@@ -811,13 +811,13 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRedPixelComponent(q,((GetRedPixelComponent(p)*(100.0-pixel.red)+
+ SetPixelRed(q,((GetPixelRed(p)*(100.0-pixel.red)+
colorize.red*pixel.red)/100.0));
- SetGreenPixelComponent(q,((GetGreenPixelComponent(p)*(100.0-pixel.green)+
+ SetPixelGreen(q,((GetPixelGreen(p)*(100.0-pixel.green)+
colorize.green*pixel.green)/100.0));
- SetBluePixelComponent(q,((GetBluePixelComponent(p)*(100.0-pixel.blue)+
+ SetPixelBlue(q,((GetPixelBlue(p)*(100.0-pixel.blue)+
colorize.blue*pixel.blue)/100.0));
- SetOpacityPixelComponent(q,((GetOpacityPixelComponent(p)*(100.0-
+ SetPixelOpacity(q,((GetPixelOpacity(p)*(100.0-
pixel.opacity)+colorize.opacity*pixel.opacity)/100.0));
p++;
q++;
@@ -1021,28 +1021,28 @@
height=color_matrix->height > 6 ? 6UL : color_matrix->height;
for (v=0; v < (ssize_t) height; v++)
{
- pixel=ColorMatrix[v][0]*GetRedPixelComponent(p)+ColorMatrix[v][1]*
- GetGreenPixelComponent(p)+ColorMatrix[v][2]*GetBluePixelComponent(p);
+ pixel=ColorMatrix[v][0]*GetPixelRed(p)+ColorMatrix[v][1]*
+ GetPixelGreen(p)+ColorMatrix[v][2]*GetPixelBlue(p);
if (image->matte != MagickFalse)
- pixel+=ColorMatrix[v][3]*(QuantumRange-GetOpacityPixelComponent(p));
+ pixel+=ColorMatrix[v][3]*(QuantumRange-GetPixelOpacity(p));
if (image->colorspace == CMYKColorspace)
- pixel+=ColorMatrix[v][4]*GetIndexPixelComponent(indexes+x);
+ pixel+=ColorMatrix[v][4]*GetPixelIndex(indexes+x);
pixel+=QuantumRange*ColorMatrix[v][5];
switch (v)
{
- case 0: SetRedPixelComponent(q,ClampToQuantum(pixel)); break;
- case 1: SetGreenPixelComponent(q,ClampToQuantum(pixel)); break;
- case 2: SetBluePixelComponent(q,ClampToQuantum(pixel)); break;
+ case 0: SetPixelRed(q,ClampToQuantum(pixel)); break;
+ case 1: SetPixelGreen(q,ClampToQuantum(pixel)); break;
+ case 2: SetPixelBlue(q,ClampToQuantum(pixel)); break;
case 3:
{
if (image->matte != MagickFalse)
- SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelAlpha(q,ClampToQuantum(pixel));
break;
}
case 4:
{
if (image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(color_indexes+x,ClampToQuantum(pixel));
+ SetPixelIndex(color_indexes+x,ClampToQuantum(pixel));
break;
}
}
@@ -1533,7 +1533,7 @@
if (pixel.matte == MagickFalse)
return(1.0);
- alpha=(MagickRealType) (QuantumScale*GetAlphaPixelComponent(&pixel));
+ alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(&pixel));
return(alpha);
}
case IndexChannel:
@@ -1564,7 +1564,7 @@
case 'a':
{
if (LocaleCompare(symbol,"a") == 0)
- return((MagickRealType) (QuantumScale*GetAlphaPixelComponent(&pixel)));
+ return((MagickRealType) (QuantumScale*GetPixelAlpha(&pixel)));
break;
}
case 'B':
@@ -3037,21 +3037,21 @@
{
(void) FxEvaluateChannelExpression(fx_info[id],RedChannel,x,y,
&alpha,exception);
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*
+ SetPixelRed(q,ClampToQuantum((MagickRealType) QuantumRange*
alpha));
}
if ((channel & GreenChannel) != 0)
{
(void) FxEvaluateChannelExpression(fx_info[id],GreenChannel,x,y,
&alpha,exception);
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*
+ SetPixelGreen(q,ClampToQuantum((MagickRealType) QuantumRange*
alpha));
}
if ((channel & BlueChannel) != 0)
{
(void) FxEvaluateChannelExpression(fx_info[id],BlueChannel,x,y,
&alpha,exception);
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*
+ SetPixelBlue(q,ClampToQuantum((MagickRealType) QuantumRange*
alpha));
}
if ((channel & OpacityChannel) != 0)
@@ -3059,10 +3059,10 @@
(void) FxEvaluateChannelExpression(fx_info[id],OpacityChannel,x,y,
&alpha,exception);
if (image->matte == MagickFalse)
- SetOpacityPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelOpacity(q,ClampToQuantum((MagickRealType)
QuantumRange*alpha));
else
- SetOpacityPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelOpacity(q,ClampToQuantum((MagickRealType)
(QuantumRange-QuantumRange*alpha)));
}
if (((channel & IndexChannel) != 0) &&
@@ -3070,7 +3070,7 @@
{
(void) FxEvaluateChannelExpression(fx_info[id],IndexChannel,x,y,
&alpha,exception);
- SetIndexPixelComponent(fx_indexes+x,ClampToQuantum((MagickRealType)
+ SetPixelIndex(fx_indexes+x,ClampToQuantum((MagickRealType)
QuantumRange*alpha));
}
q++;
@@ -3460,14 +3460,14 @@
}
for (x=0; x < (ssize_t) morph_images->columns; x++)
{
- SetRedPixelComponent(q,ClampToQuantum(alpha*
- GetRedPixelComponent(q)+beta*GetRedPixelComponent(p)));
- SetGreenPixelComponent(q,ClampToQuantum(alpha*
- GetGreenPixelComponent(q)+beta*GetGreenPixelComponent(p)));
- SetBluePixelComponent(q,ClampToQuantum(alpha*
- GetBluePixelComponent(q)+beta*GetBluePixelComponent(p)));
- SetOpacityPixelComponent(q,ClampToQuantum(alpha*
- GetOpacityPixelComponent(q)+beta*GetOpacityPixelComponent(p)));
+ SetPixelRed(q,ClampToQuantum(alpha*
+ GetPixelRed(q)+beta*GetPixelRed(p)));
+ SetPixelGreen(q,ClampToQuantum(alpha*
+ GetPixelGreen(q)+beta*GetPixelGreen(p)));
+ SetPixelBlue(q,ClampToQuantum(alpha*
+ GetPixelBlue(q)+beta*GetPixelBlue(p)));
+ SetPixelOpacity(q,ClampToQuantum(alpha*
+ GetPixelOpacity(q)+beta*GetPixelOpacity(p)));
p++;
q++;
}
@@ -3639,11 +3639,11 @@
q=QueueCacheViewAuthenticPixels(image_view,x,y_mid,1,1,exception);
if (q == (PixelPacket *) NULL)
return(MagickTrue);
- SetRedPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+ SetPixelRed(q,PlasmaPixel(random_info,(MagickRealType)
(u.red+v.red)/2.0,plasma));
- SetGreenPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+ SetPixelGreen(q,PlasmaPixel(random_info,(MagickRealType)
(u.green+v.green)/2.0,plasma));
- SetBluePixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+ SetPixelBlue(q,PlasmaPixel(random_info,(MagickRealType)
(u.blue+v.blue)/2.0,plasma));
(void) SyncCacheViewAuthenticPixels(image_view,exception);
if (segment->x1 != segment->x2)
@@ -3659,11 +3659,11 @@
q=QueueCacheViewAuthenticPixels(image_view,x,y_mid,1,1,exception);
if (q == (PixelPacket *) NULL)
return(MagickTrue);
- SetRedPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+ SetPixelRed(q,PlasmaPixel(random_info,(MagickRealType)
(u.red+v.red)/2.0,plasma));
- SetGreenPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+ SetPixelGreen(q,PlasmaPixel(random_info,(MagickRealType)
(u.green+v.green)/2.0,plasma));
- SetBluePixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+ SetPixelBlue(q,PlasmaPixel(random_info,(MagickRealType)
(u.blue+v.blue)/2.0,plasma));
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
@@ -3686,11 +3686,11 @@
q=QueueCacheViewAuthenticPixels(image_view,x_mid,y,1,1,exception);
if (q == (PixelPacket *) NULL)
return(MagickTrue);
- SetRedPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+ SetPixelRed(q,PlasmaPixel(random_info,(MagickRealType)
(u.red+v.red)/2.0,plasma));
- SetGreenPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+ SetPixelGreen(q,PlasmaPixel(random_info,(MagickRealType)
(u.green+v.green)/2.0,plasma));
- SetBluePixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+ SetPixelBlue(q,PlasmaPixel(random_info,(MagickRealType)
(u.blue+v.blue)/2.0,plasma));
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
@@ -3710,11 +3710,11 @@
q=QueueCacheViewAuthenticPixels(image_view,x_mid,y,1,1,exception);
if (q == (PixelPacket *) NULL)
return(MagickTrue);
- SetRedPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+ SetPixelRed(q,PlasmaPixel(random_info,(MagickRealType)
(u.red+v.red)/2.0,plasma));
- SetGreenPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+ SetPixelGreen(q,PlasmaPixel(random_info,(MagickRealType)
(u.green+v.green)/2.0,plasma));
- SetBluePixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+ SetPixelBlue(q,PlasmaPixel(random_info,(MagickRealType)
(u.blue+v.blue)/2.0,plasma));
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
@@ -3736,11 +3736,11 @@
q=QueueCacheViewAuthenticPixels(image_view,x_mid,y_mid,1,1,exception);
if (q == (PixelPacket *) NULL)
return(MagickTrue);
- SetRedPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+ SetPixelRed(q,PlasmaPixel(random_info,(MagickRealType)
(u.red+v.red)/2.0,plasma));
- SetGreenPixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+ SetPixelGreen(q,PlasmaPixel(random_info,(MagickRealType)
(u.green+v.green)/2.0,plasma));
- SetBluePixelComponent(q,PlasmaPixel(random_info,(MagickRealType)
+ SetPixelBlue(q,PlasmaPixel(random_info,(MagickRealType)
(u.blue+v.blue)/2.0,plasma));
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
@@ -4069,17 +4069,17 @@
intensity=(MagickRealType) PixelIntensityToQuantum(p);
tone=intensity > threshold ? (MagickRealType) QuantumRange : intensity+
(MagickRealType) QuantumRange-threshold;
- SetRedPixelComponent(q,ClampToQuantum(tone));
+ SetPixelRed(q,ClampToQuantum(tone));
tone=intensity > (7.0*threshold/6.0) ? (MagickRealType) QuantumRange :
intensity+(MagickRealType) QuantumRange-7.0*threshold/6.0;
- SetGreenPixelComponent(q,ClampToQuantum(tone));
+ SetPixelGreen(q,ClampToQuantum(tone));
tone=intensity < (threshold/6.0) ? 0 : intensity-threshold/6.0;
- SetBluePixelComponent(q,ClampToQuantum(tone));
+ SetPixelBlue(q,ClampToQuantum(tone));
tone=threshold/7.0;
- if ((MagickRealType) GetGreenPixelComponent(q) < tone)
- SetGreenPixelComponent(q,ClampToQuantum(tone));
- if ((MagickRealType) GetBluePixelComponent(q) < tone)
- SetBluePixelComponent(q,ClampToQuantum(tone));
+ if ((MagickRealType) GetPixelGreen(q) < tone)
+ SetPixelGreen(q,ClampToQuantum(tone));
+ if ((MagickRealType) GetPixelBlue(q) < tone)
+ SetPixelBlue(q,ClampToQuantum(tone));
p++;
q++;
}
@@ -4218,14 +4218,14 @@
}
for (x=0; x < (ssize_t) border_image->columns; x++)
{
- SetRedPixelComponent(q,border_image->background_color.red);
- SetGreenPixelComponent(q,border_image->background_color.green);
- SetBluePixelComponent(q,border_image->background_color.blue);
+ SetPixelRed(q,border_image->background_color.red);
+ SetPixelGreen(q,border_image->background_color.green);
+ SetPixelBlue(q,border_image->background_color.blue);
if (border_image->matte == MagickFalse)
- SetOpacityPixelComponent(q,border_image->background_color.opacity);
+ SetPixelOpacity(q,border_image->background_color.opacity);
else
- SetOpacityPixelComponent(q,ClampToQuantum((MagickRealType)
- (QuantumRange-GetAlphaPixelComponent(q)*opacity/100.0)));
+ SetPixelOpacity(q,ClampToQuantum((MagickRealType)
+ (QuantumRange-GetPixelAlpha(q)*opacity/100.0)));
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -4515,12 +4515,12 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((MagickRealType) GetRedPixelComponent(q) > threshold)
- SetRedPixelComponent(q,QuantumRange-GetRedPixelComponent(q));
- if ((MagickRealType) GetGreenPixelComponent(q) > threshold)
- SetGreenPixelComponent(q,QuantumRange-GetGreenPixelComponent(q));
- if ((MagickRealType) GetBluePixelComponent(q) > threshold)
- SetBluePixelComponent(q,QuantumRange-GetBluePixelComponent(q));
+ if ((MagickRealType) GetPixelRed(q) > threshold)
+ SetPixelRed(q,QuantumRange-GetPixelRed(q));
+ if ((MagickRealType) GetPixelGreen(q) > threshold)
+ SetPixelGreen(q,QuantumRange-GetPixelGreen(q));
+ if ((MagickRealType) GetPixelBlue(q) > threshold)
+ SetPixelBlue(q,QuantumRange-GetPixelBlue(q));
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -4662,19 +4662,19 @@
{
case 0:
{
- SetBit(GetRedPixelComponent(q),j,GetBit(PixelIntensityToQuantum(
+ SetBit(GetPixelRed(q),j,GetBit(PixelIntensityToQuantum(
&pixel),i));
break;
}
case 1:
{
- SetBit(GetGreenPixelComponent(q),j,GetBit(PixelIntensityToQuantum(
+ SetBit(GetPixelGreen(q),j,GetBit(PixelIntensityToQuantum(
&pixel),i));
break;
}
case 2:
{
- SetBit(GetBluePixelComponent(q),j,GetBit(PixelIntensityToQuantum(
+ SetBit(GetPixelBlue(q),j,GetBit(PixelIntensityToQuantum(
&pixel),i));
break;
}
@@ -4829,10 +4829,10 @@
break;
for (x=0; x < (ssize_t) stereo_image->columns; x++)
{
- SetRedPixelComponent(r,GetRedPixelComponent(p));
- SetGreenPixelComponent(r,GetGreenPixelComponent(q));
- SetBluePixelComponent(r,GetBluePixelComponent(q));
- SetOpacityPixelComponent(r,(GetOpacityPixelComponent(p)+q->opacity)/2);
+ SetPixelRed(r,GetPixelRed(p));
+ SetPixelGreen(r,GetPixelGreen(q));
+ SetPixelBlue(r,GetPixelBlue(q));
+ SetPixelOpacity(r,(GetPixelOpacity(p)+q->opacity)/2);
p++;
q++;
r++;
@@ -5189,19 +5189,19 @@
MagickRealType
weight;
- weight=QuantumScale*GetRedPixelComponent(p)-0.5;
- pixel.red=(MagickRealType) GetRedPixelComponent(p)+color_vector.red*(1.0-(4.0*
+ weight=QuantumScale*GetPixelRed(p)-0.5;
+ pixel.red=(MagickRealType) GetPixelRed(p)+color_vector.red*(1.0-(4.0*
(weight*weight)));
- SetRedPixelComponent(q,ClampToQuantum(pixel.red));
- weight=QuantumScale*GetGreenPixelComponent(p)-0.5;
- pixel.green=(MagickRealType) GetGreenPixelComponent(p)+color_vector.green*(1.0-(4.0*
+ SetPixelRed(q,ClampToQuantum(pixel.red));
+ weight=QuantumScale*GetPixelGreen(p)-0.5;
+ pixel.green=(MagickRealType) GetPixelGreen(p)+color_vector.green*(1.0-(4.0*
(weight*weight)));
- SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
- weight=QuantumScale*GetBluePixelComponent(p)-0.5;
- pixel.blue=(MagickRealType) GetBluePixelComponent(p)+color_vector.blue*(1.0-(4.0*
+ SetPixelGreen(q,ClampToQuantum(pixel.green));
+ weight=QuantumScale*GetPixelBlue(p)-0.5;
+ pixel.blue=(MagickRealType) GetPixelBlue(p)+color_vector.blue*(1.0-(4.0*
(weight*weight)));
- SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
- SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+ SetPixelBlue(q,ClampToQuantum(pixel.blue));
+ SetPixelOpacity(q,GetPixelOpacity(p));
p++;
q++;
}
diff --git a/magick/histogram.c b/magick/histogram.c
index 5027c53..72888f1 100644
--- a/magick/histogram.c
+++ b/magick/histogram.c
@@ -286,7 +286,7 @@
node_info->list[i].pixel=(*p);
if ((image->colorspace == CMYKColorspace) ||
(image->storage_class == PseudoClass))
- node_info->list[i].index=GetIndexPixelComponent(indexes+x);
+ node_info->list[i].index=GetPixelIndex(indexes+x);
node_info->list[i].count=1;
node_info->number_unique++;
cube_info->colors++;
@@ -757,7 +757,7 @@
node_info->list[i].pixel=(*p);
if ((image->colorspace == CMYKColorspace) ||
(image->storage_class == PseudoClass))
- node_info->list[i].index=GetIndexPixelComponent(indexes+x);
+ node_info->list[i].index=GetPixelIndex(indexes+x);
node_info->list[i].count=1;
node_info->number_unique++;
cube_info->colors++;
@@ -920,7 +920,7 @@
node_info->list[i].pixel=(*p);
if ((image->colorspace == CMYKColorspace) ||
(image->storage_class == PseudoClass))
- node_info->list[i].index=GetIndexPixelComponent(indexes+x);
+ node_info->list[i].index=GetPixelIndex(indexes+x);
node_info->list[i].count=1;
node_info->number_unique++;
cube_info->colors++;
diff --git a/magick/identify.c b/magick/identify.c
index f25e3c6..334115f 100644
--- a/magick/identify.c
+++ b/magick/identify.c
@@ -606,7 +606,7 @@
indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity)
+ if (GetPixelOpacity(p) == (Quantum) TransparentOpacity)
break;
p++;
}
diff --git a/magick/image.c b/magick/image.c
index 9f50e61..584d7dd 100644
--- a/magick/image.c
+++ b/magick/image.c
@@ -541,16 +541,15 @@
append_indexes=GetCacheViewAuthenticIndexQueue(append_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRedPixelComponent(q,GetRedPixelComponent(p));
- SetGreenPixelComponent(q,GetGreenPixelComponent(p));
- SetBluePixelComponent(q,GetBluePixelComponent(p));
- SetOpacityPixelComponent(q,OpaqueOpacity);
+ SetPixelRed(q,GetPixelRed(p));
+ SetPixelGreen(q,GetPixelGreen(p));
+ SetPixelBlue(q,GetPixelBlue(p));
+ SetPixelOpacity(q,OpaqueOpacity);
if (image->matte != MagickFalse)
- SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+ SetPixelOpacity(q,GetPixelOpacity(p));
if ((image->colorspace == CMYKColorspace) &&
(append_image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(append_indexes+x,GetIndexPixelComponent(
- indexes+x));
+ SetPixelIndex(append_indexes+x,GetPixelIndex(indexes+x));
p++;
q++;
}
@@ -1102,7 +1101,7 @@
q=pixels;
for (x=0; x < (ssize_t) combine_image->columns; x++)
{
- SetRedPixelComponent(q,PixelIntensityToQuantum(p));
+ SetPixelRed(q,PixelIntensityToQuantum(p));
p++;
q++;
}
@@ -1118,7 +1117,7 @@
q=pixels;
for (x=0; x < (ssize_t) combine_image->columns; x++)
{
- SetGreenPixelComponent(q,PixelIntensityToQuantum(p));
+ SetPixelGreen(q,PixelIntensityToQuantum(p));
p++;
q++;
}
@@ -1134,7 +1133,7 @@
q=pixels;
for (x=0; x < (ssize_t) combine_image->columns; x++)
{
- SetBluePixelComponent(q,PixelIntensityToQuantum(p));
+ SetPixelBlue(q,PixelIntensityToQuantum(p));
p++;
q++;
}
@@ -1150,7 +1149,7 @@
q=pixels;
for (x=0; x < (ssize_t) combine_image->columns; x++)
{
- SetOpacityPixelComponent(q,PixelIntensityToQuantum(p));
+ SetPixelOpacity(q,PixelIntensityToQuantum(p));
p++;
q++;
}
@@ -1170,7 +1169,7 @@
indexes=GetCacheViewAuthenticIndexQueue(combine_view);
for (x=0; x < (ssize_t) combine_image->columns; x++)
{
- SetIndexPixelComponent(indexes+x,PixelIntensityToQuantum(p));
+ SetPixelIndex(indexes+x,PixelIntensityToQuantum(p));
p++;
}
image_view=DestroyCacheView(image_view);
@@ -2407,8 +2406,8 @@
{
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
}
break;
@@ -2417,8 +2416,8 @@
{
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRedPixelComponent(q,GetGreenPixelComponent(q));
- SetBluePixelComponent(q,GetGreenPixelComponent(q));
+ SetPixelRed(q,GetPixelGreen(q));
+ SetPixelBlue(q,GetPixelGreen(q));
q++;
}
break;
@@ -2427,8 +2426,8 @@
{
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRedPixelComponent(q,GetBluePixelComponent(q));
- SetGreenPixelComponent(q,GetBluePixelComponent(q));
+ SetPixelRed(q,GetPixelBlue(q));
+ SetPixelGreen(q,GetPixelBlue(q));
q++;
}
break;
@@ -2437,9 +2436,9 @@
{
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRedPixelComponent(q,GetOpacityPixelComponent(q));
- SetGreenPixelComponent(q,GetOpacityPixelComponent(q));
- SetBluePixelComponent(q,GetOpacityPixelComponent(q));
+ SetPixelRed(q,GetPixelOpacity(q));
+ SetPixelGreen(q,GetPixelOpacity(q));
+ SetPixelBlue(q,GetPixelOpacity(q));
q++;
}
break;
@@ -2451,9 +2450,9 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRedPixelComponent(q,GetIndexPixelComponent(indexes+x));
- SetGreenPixelComponent(q,GetIndexPixelComponent(indexes+x));
- SetBluePixelComponent(q,GetIndexPixelComponent(indexes+x));
+ SetPixelRed(q,GetPixelIndex(indexes+x));
+ SetPixelGreen(q,GetPixelIndex(indexes+x));
+ SetPixelBlue(q,GetPixelIndex(indexes+x));
q++;
}
break;
@@ -2462,9 +2461,9 @@
{
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRedPixelComponent(q,GetAlphaPixelComponent(q));
- SetGreenPixelComponent(q,GetAlphaPixelComponent(q));
- SetBluePixelComponent(q,GetAlphaPixelComponent(q));
+ SetPixelRed(q,GetPixelAlpha(q));
+ SetPixelGreen(q,GetPixelAlpha(q));
+ SetPixelBlue(q,GetPixelAlpha(q));
q++;
}
break;
@@ -2473,7 +2472,7 @@
{
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetAlphaPixelComponent(q,PixelIntensityToQuantum(q));
+ SetPixelAlpha(q,PixelIntensityToQuantum(q));
q++;
}
break;
@@ -2692,9 +2691,9 @@
{
if (q->opacity == TransparentOpacity)
{
- SetRedPixelComponent(q,pixel.red);
- SetGreenPixelComponent(q,pixel.green);
- SetBluePixelComponent(q,pixel.blue);
+ SetPixelRed(q,pixel.red);
+ SetPixelGreen(q,pixel.green);
+ SetPixelBlue(q,pixel.blue);
}
q++;
}
@@ -2702,7 +2701,7 @@
{
indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
- SetIndexPixelComponent(indexes+x,index);
+ SetPixelIndex(indexes+x,index);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2866,7 +2865,7 @@
indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
- SetIndexPixelComponent(indexes+x,index);
+ SetPixelIndex(indexes+x,index);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3645,7 +3644,7 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetOpacityPixelComponent(q,opacity);
+ SetPixelOpacity(q,opacity);
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -3952,7 +3951,7 @@
{
p=GetCacheViewVirtualPixels(left_view,x,left_geometry.y+y,1,1,exception);
if ((p == (const PixelPacket *) NULL) ||
- (GetOpacityPixelComponent(p) != TransparentOpacity) ||
+ (GetPixelOpacity(p) != TransparentOpacity) ||
((left_image->columns-x-1) >= gap))
break;
}
@@ -3962,7 +3961,7 @@
p=GetCacheViewVirtualPixels(right_view,x,right_geometry.y+y,1,1,
exception);
if ((p == (const PixelPacket *) NULL) ||
- (GetOpacityPixelComponent(p) != TransparentOpacity) || ((x+i) >= (ssize_t) gap))
+ (GetPixelOpacity(p) != TransparentOpacity) || ((x+i) >= (ssize_t) gap))
break;
}
if ((x+i) < (ssize_t) gap)
@@ -4022,7 +4021,7 @@
{
p=GetCacheViewVirtualPixels(top_view,top_geometry.x+x,y,1,1,exception);
if ((p == (const PixelPacket *) NULL) ||
- (GetOpacityPixelComponent(p) != TransparentOpacity) || ((top_image->rows-y-1) >= gap))
+ (GetPixelOpacity(p) != TransparentOpacity) || ((top_image->rows-y-1) >= gap))
break;
}
i=(ssize_t) top_image->rows-y-1;
@@ -4031,7 +4030,7 @@
p=GetCacheViewVirtualPixels(bottom_view,bottom_geometry.x+x,y,1,1,
exception);
if ((p == (const PixelPacket *) NULL) ||
- (GetOpacityPixelComponent(p) != TransparentOpacity) || ((y+i) >= (ssize_t) gap))
+ (GetPixelOpacity(p) != TransparentOpacity) || ((y+i) >= (ssize_t) gap))
break;
}
if ((y+i) < (ssize_t) gap)
@@ -4295,12 +4294,12 @@
indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- index=PushColormapIndex(image,(size_t) GetIndexPixelComponent(indexes+x),
+ index=PushColormapIndex(image,(size_t) GetPixelIndex(indexes+x),
&range_exception);
if (image->matte == MagickFalse)
- SetRGBPixelComponents(q,image->colormap+(ssize_t) index)
+ SetPixelRGB(q,image->colormap+(ssize_t) index)
else
- SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+ SetPixelRGBO(q,image->colormap+(ssize_t) index);
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
diff --git a/magick/layer.c b/magick/layer.c
index 95a04fd..5cba077 100644
--- a/magick/layer.c
+++ b/magick/layer.c
@@ -191,7 +191,7 @@
break;
for (x=0; x < (ssize_t) bounds->width; x++)
{
- if ((GetOpacityPixelComponent(p) <= (Quantum) (QuantumRange/2)) &&
+ if ((GetPixelOpacity(p) <= (Quantum) (QuantumRange/2)) &&
(q->opacity > (Quantum) (QuantumRange/2)))
break;
p++;
@@ -538,7 +538,7 @@
if (method == CompareAnyLayer)
return((MagickBooleanType)(IsMagickColorSimilar(p,q) == MagickFalse));
- o1 = (p->matte != MagickFalse) ? GetOpacityPixelComponent(p) : OpaqueOpacity;
+ o1 = (p->matte != MagickFalse) ? GetPixelOpacity(p) : OpaqueOpacity;
o2 = (q->matte != MagickFalse) ? q->opacity : OpaqueOpacity;
/*
diff --git a/magick/mac.c b/magick/mac.c
index 3183d1f..6637e18 100644
--- a/magick/mac.c
+++ b/magick/mac.c
@@ -1364,11 +1364,11 @@
for (x=0; x < image->columns; x++)
{
GetCPixel(x,y,&Pixel);
- SetRedPixelComponent(q,ScaleCharToQuantum(Pixel.red & 0xff));
- SetGreenPixelComponent(q,ScaleCharToQuantum(Pixel.green & 0xff));
- SetBluePixelComponent(q,ScaleCharToQuantum(Pixel.blue & 0xff));
+ SetPixelRed(q,ScaleCharToQuantum(Pixel.red & 0xff));
+ SetPixelGreen(q,ScaleCharToQuantum(Pixel.green & 0xff));
+ SetPixelBlue(q,ScaleCharToQuantum(Pixel.blue & 0xff));
if (image->storage_class == PseudoClass)
- SetIndexPixelComponent(indexes+x,Color2Index(&Pixel));
+ SetPixelIndex(indexes+x,Color2Index(&Pixel));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
diff --git a/magick/morphology.c b/magick/morphology.c
index 79155aa..de93e7d 100644
--- a/magick/morphology.c
+++ b/magick/morphology.c
@@ -2645,7 +2645,7 @@
*/
*q = p[r];
if (image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(q_indexes+y,GetIndexPixelComponent(
+ SetPixelIndex(q_indexes+y,GetPixelIndex(
p_indexes+r));
/* Set the bias of the weighted average output */
@@ -2672,10 +2672,10 @@
*/
for (v=0; v < (ssize_t) kernel->height; v++) {
if ( IsNan(*k) ) continue;
- result.red += (*k)*GetRedPixelComponent(k_pixels);
- result.green += (*k)*GetGreenPixelComponent(k_pixels);
- result.blue += (*k)*GetBluePixelComponent(k_pixels);
- result.opacity += (*k)*GetOpacityPixelComponent(k_pixels);
+ result.red += (*k)*GetPixelRed(k_pixels);
+ result.green += (*k)*GetPixelGreen(k_pixels);
+ result.blue += (*k)*GetPixelBlue(k_pixels);
+ result.opacity += (*k)*GetPixelOpacity(k_pixels);
if ( image->colorspace == CMYKColorspace)
result.index += (*k)*(*k_indexes);
k--;
@@ -2683,17 +2683,17 @@
k_indexes++;
}
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(result.red));
+ SetPixelRed(q,ClampToQuantum(result.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(result.green));
+ SetPixelGreen(q,ClampToQuantum(result.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(result.blue));
+ SetPixelBlue(q,ClampToQuantum(result.blue));
if ((channel & OpacityChannel) != 0
&& image->matte == MagickTrue )
- SetOpacityPixelComponent(q,ClampToQuantum(result.opacity));
+ SetPixelOpacity(q,ClampToQuantum(result.opacity));
if ((channel & IndexChannel) != 0
&& image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(q_indexes+x,ClampToQuantum(result.index));
+ SetPixelIndex(q_indexes+x,ClampToQuantum(result.index));
}
else
{ /* Channel 'Sync' Flag, and Alpha Channel enabled.
@@ -2707,12 +2707,12 @@
gamma=0.0;
for (v=0; v < (ssize_t) kernel->height; v++) {
if ( IsNan(*k) ) continue;
- alpha=(*k)*(QuantumScale*(QuantumRange-GetOpacityPixelComponent(k_pixels)));
+ alpha=(*k)*(QuantumScale*(QuantumRange-GetPixelOpacity(k_pixels)));
gamma += alpha;
- result.red += alpha*GetRedPixelComponent(k_pixels);
- result.green += alpha*GetGreenPixelComponent(k_pixels);
- result.blue += alpha*GetBluePixelComponent(k_pixels);
- result.opacity += (*k)*GetOpacityPixelComponent(k_pixels);
+ result.red += alpha*GetPixelRed(k_pixels);
+ result.green += alpha*GetPixelGreen(k_pixels);
+ result.blue += alpha*GetPixelBlue(k_pixels);
+ result.opacity += (*k)*GetPixelOpacity(k_pixels);
if ( image->colorspace == CMYKColorspace)
result.index += alpha*(*k_indexes);
k--;
@@ -2721,22 +2721,22 @@
}
/* Sync'ed channels, all channels are modified */
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- SetRedPixelComponent(q,ClampToQuantum(gamma*result.red));
- SetGreenPixelComponent(q,ClampToQuantum(gamma*result.green));
- SetBluePixelComponent(q,ClampToQuantum(gamma*result.blue));
- SetOpacityPixelComponent(q,ClampToQuantum(result.opacity));
+ SetPixelRed(q,ClampToQuantum(gamma*result.red));
+ SetPixelGreen(q,ClampToQuantum(gamma*result.green));
+ SetPixelBlue(q,ClampToQuantum(gamma*result.blue));
+ SetPixelOpacity(q,ClampToQuantum(result.opacity));
if (image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(q_indexes+x,ClampToQuantum(gamma*
+ SetPixelIndex(q_indexes+x,ClampToQuantum(gamma*
result.index));
}
/* Count up changed pixels */
- if ( ( p[r].red != GetRedPixelComponent(q))
- || ( p[r].green != GetGreenPixelComponent(q))
- || ( p[r].blue != GetBluePixelComponent(q))
- || ( p[r].opacity != GetOpacityPixelComponent(q))
+ if ( ( p[r].red != GetPixelRed(q))
+ || ( p[r].green != GetPixelGreen(q))
+ || ( p[r].blue != GetPixelBlue(q))
+ || ( p[r].opacity != GetPixelOpacity(q))
|| ( image->colorspace == CMYKColorspace &&
- GetIndexPixelComponent(p_indexes+r) != GetIndexPixelComponent(q_indexes+x) ) )
+ GetPixelIndex(p_indexes+r) != GetPixelIndex(q_indexes+x) ) )
changed++; /* The pixel was changed in some way! */
p++;
q++;
@@ -2832,7 +2832,7 @@
*/
*q = p[r];
if (image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(q_indexes+x,GetIndexPixelComponent(p_indexes+r));
+ SetPixelIndex(q_indexes+x,GetPixelIndex(p_indexes+r));
/* Defaults */
min.red =
@@ -2852,7 +2852,7 @@
result.opacity = QuantumRange - (MagickRealType) p[r].opacity;
result.index = 0.0;
if ( image->colorspace == CMYKColorspace)
- result.index = (MagickRealType) GetIndexPixelComponent(p_indexes+r);
+ result.index = (MagickRealType) GetPixelIndex(p_indexes+r);
switch (method) {
case ConvolveMorphology:
@@ -2908,23 +2908,23 @@
result.blue += (*k)*k_pixels[u].blue;
result.opacity += (*k)*k_pixels[u].opacity;
if ( image->colorspace == CMYKColorspace)
- result.index += (*k)*GetIndexPixelComponent(k_indexes+u);
+ result.index += (*k)*GetPixelIndex(k_indexes+u);
}
k_pixels += virt_width;
k_indexes += virt_width;
}
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(result.red));
+ SetPixelRed(q,ClampToQuantum(result.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(result.green));
+ SetPixelGreen(q,ClampToQuantum(result.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(result.blue));
+ SetPixelBlue(q,ClampToQuantum(result.blue));
if ((channel & OpacityChannel) != 0
&& image->matte == MagickTrue )
- SetOpacityPixelComponent(q,ClampToQuantum(result.opacity));
+ SetPixelOpacity(q,ClampToQuantum(result.opacity));
if ((channel & IndexChannel) != 0
&& image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(q_indexes+x,ClampToQuantum(
+ SetPixelIndex(q_indexes+x,ClampToQuantum(
result.index));
}
else
@@ -2948,19 +2948,19 @@
result.blue += alpha*k_pixels[u].blue;
result.opacity += (*k)*k_pixels[u].opacity;
if ( image->colorspace == CMYKColorspace)
- result.index+=alpha*GetIndexPixelComponent(k_indexes+u);
+ result.index+=alpha*GetPixelIndex(k_indexes+u);
}
k_pixels += virt_width;
k_indexes += virt_width;
}
/* Sync'ed channels, all channels are modified */
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- SetRedPixelComponent(q,ClampToQuantum(gamma*result.red));
- SetGreenPixelComponent(q,ClampToQuantum(gamma*result.green));
- SetBluePixelComponent(q,ClampToQuantum(gamma*result.blue));
- SetOpacityPixelComponent(q,ClampToQuantum(result.opacity));
+ SetPixelRed(q,ClampToQuantum(gamma*result.red));
+ SetPixelGreen(q,ClampToQuantum(gamma*result.green));
+ SetPixelBlue(q,ClampToQuantum(gamma*result.blue));
+ SetPixelOpacity(q,ClampToQuantum(result.opacity));
if (image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(q_indexes+x,ClampToQuantum(gamma*
+ SetPixelIndex(q_indexes+x,ClampToQuantum(gamma*
result.index));
}
break;
@@ -2986,7 +2986,7 @@
Minimize(min.opacity,
QuantumRange-(double) k_pixels[u].opacity);
if ( image->colorspace == CMYKColorspace)
- Minimize(min.index,(double) GetIndexPixelComponent(
+ Minimize(min.index,(double) GetPixelIndex(
k_indexes+u));
}
k_pixels += virt_width;
@@ -3018,7 +3018,7 @@
Maximize(max.opacity,
QuantumRange-(double) k_pixels[u].opacity);
if ( image->colorspace == CMYKColorspace)
- Maximize(max.index, (double) GetIndexPixelComponent(
+ Maximize(max.index, (double) GetPixelIndex(
k_indexes+u));
}
k_pixels += virt_width;
@@ -3054,7 +3054,7 @@
Minimize(min.opacity,
QuantumRange-(double) k_pixels[u].opacity);
if ( image->colorspace == CMYKColorspace)
- Minimize(min.index,(double) GetIndexPixelComponent(
+ Minimize(min.index,(double) GetPixelIndex(
k_indexes+u));
}
else if ( (*k) < 0.3 )
@@ -3065,7 +3065,7 @@
Maximize(max.opacity,
QuantumRange-(double) k_pixels[u].opacity);
if ( image->colorspace == CMYKColorspace)
- Maximize(max.index, (double) GetIndexPixelComponent(
+ Maximize(max.index, (double) GetPixelIndex(
k_indexes+u));
}
}
@@ -3167,7 +3167,7 @@
Minimize(result.blue, (*k)+k_pixels[u].blue);
Minimize(result.opacity, (*k)+QuantumRange-k_pixels[u].opacity);
if ( image->colorspace == CMYKColorspace)
- Minimize(result.index,(*k)+GetIndexPixelComponent(
+ Minimize(result.index,(*k)+GetPixelIndex(
k_indexes+u));
}
k_pixels += virt_width;
@@ -3223,26 +3223,26 @@
break; /* full pixel was directly assigned - not a channel method */
default:
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(result.red));
+ SetPixelRed(q,ClampToQuantum(result.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(result.green));
+ SetPixelGreen(q,ClampToQuantum(result.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(result.blue));
+ SetPixelBlue(q,ClampToQuantum(result.blue));
if ((channel & OpacityChannel) != 0
&& image->matte == MagickTrue )
- SetAlphaPixelComponent(q,ClampToQuantum(result.opacity));
+ SetPixelAlpha(q,ClampToQuantum(result.opacity));
if ((channel & IndexChannel) != 0
&& image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(q_indexes+x,ClampToQuantum(result.index));
+ SetPixelIndex(q_indexes+x,ClampToQuantum(result.index));
break;
}
/* Count up changed pixels */
- if ( ( p[r].red != GetRedPixelComponent(q) )
- || ( p[r].green != GetGreenPixelComponent(q) )
- || ( p[r].blue != GetBluePixelComponent(q) )
- || ( p[r].opacity != GetOpacityPixelComponent(q) )
+ if ( ( p[r].red != GetPixelRed(q) )
+ || ( p[r].green != GetPixelGreen(q) )
+ || ( p[r].blue != GetPixelBlue(q) )
+ || ( p[r].opacity != GetPixelOpacity(q) )
|| ( image->colorspace == CMYKColorspace &&
- GetIndexPixelComponent(p_indexes+r) != GetIndexPixelComponent(q_indexes+x) ) )
+ GetPixelIndex(p_indexes+r) != GetPixelIndex(q_indexes+x) ) )
changed++; /* The pixel was changed in some way! */
p++;
q++;
@@ -3420,7 +3420,7 @@
Minimize(result.blue, (*k)+k_pixels[u].blue);
Minimize(result.opacity, (*k)+QuantumRange-k_pixels[u].opacity);
if ( image->colorspace == CMYKColorspace)
- Minimize(result.index, (*k)+GetIndexPixelComponent(k_indexes+u));
+ Minimize(result.index, (*k)+GetPixelIndex(k_indexes+u));
}
k_pixels += virt_width;
k_indexes += virt_width;
@@ -3437,7 +3437,7 @@
Minimize(result.blue, (*k)+k_pixels[u].blue);
Minimize(result.opacity, (*k)+QuantumRange-k_pixels[u].opacity);
if ( image->colorspace == CMYKColorspace)
- Minimize(result.index, (*k)+GetIndexPixelComponent(k_indexes+u));
+ Minimize(result.index, (*k)+GetPixelIndex(k_indexes+u));
}
break;
case VoronoiMorphology:
@@ -3488,25 +3488,25 @@
break;
default:
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(result.red));
+ SetPixelRed(q,ClampToQuantum(result.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(result.green));
+ SetPixelGreen(q,ClampToQuantum(result.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(result.blue));
+ SetPixelBlue(q,ClampToQuantum(result.blue));
if ((channel & OpacityChannel) != 0 && image->matte == MagickTrue )
- SetAlphaPixelComponent(q,ClampToQuantum(result.opacity));
+ SetPixelAlpha(q,ClampToQuantum(result.opacity));
if ((channel & IndexChannel) != 0
&& image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(q_indexes+x,ClampToQuantum(result.index));
+ SetPixelIndex(q_indexes+x,ClampToQuantum(result.index));
break;
}
/* Count up changed pixels */
- if ( ( p[r].red != GetRedPixelComponent(q) )
- || ( p[r].green != GetGreenPixelComponent(q) )
- || ( p[r].blue != GetBluePixelComponent(q) )
- || ( p[r].opacity != GetOpacityPixelComponent(q) )
+ if ( ( p[r].red != GetPixelRed(q) )
+ || ( p[r].green != GetPixelGreen(q) )
+ || ( p[r].blue != GetPixelBlue(q) )
+ || ( p[r].opacity != GetPixelOpacity(q) )
|| ( image->colorspace == CMYKColorspace &&
- GetIndexPixelComponent(p_indexes+r) != GetIndexPixelComponent(q_indexes+x) ) )
+ GetPixelIndex(p_indexes+r) != GetPixelIndex(q_indexes+x) ) )
changed++; /* The pixel was changed in some way! */
p++; /* increment pixel buffers */
@@ -3610,7 +3610,7 @@
Minimize(result.blue, (*k)+k_pixels[u].blue);
Minimize(result.opacity, (*k)+QuantumRange-k_pixels[u].opacity);
if ( image->colorspace == CMYKColorspace)
- Minimize(result.index,(*k)+GetIndexPixelComponent(k_indexes+u));
+ Minimize(result.index,(*k)+GetPixelIndex(k_indexes+u));
}
k_pixels += virt_width;
k_indexes += virt_width;
@@ -3627,7 +3627,7 @@
Minimize(result.blue, (*k)+k_pixels[u].blue);
Minimize(result.opacity, (*k)+QuantumRange-k_pixels[u].opacity);
if ( image->colorspace == CMYKColorspace)
- Minimize(result.index, (*k)+GetIndexPixelComponent(k_indexes+u));
+ Minimize(result.index, (*k)+GetPixelIndex(k_indexes+u));
}
break;
case VoronoiMorphology:
@@ -3678,25 +3678,25 @@
break;
default:
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(result.red));
+ SetPixelRed(q,ClampToQuantum(result.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(result.green));
+ SetPixelGreen(q,ClampToQuantum(result.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(result.blue));
+ SetPixelBlue(q,ClampToQuantum(result.blue));
if ((channel & OpacityChannel) != 0 && image->matte == MagickTrue )
- SetAlphaPixelComponent(q,ClampToQuantum(result.opacity));
+ SetPixelAlpha(q,ClampToQuantum(result.opacity));
if ((channel & IndexChannel) != 0
&& image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(q_indexes+x,ClampToQuantum(result.index));
+ SetPixelIndex(q_indexes+x,ClampToQuantum(result.index));
break;
}
/* Count up changed pixels */
- if ( ( p[r].red != GetRedPixelComponent(q) )
- || ( p[r].green != GetGreenPixelComponent(q) )
- || ( p[r].blue != GetBluePixelComponent(q) )
- || ( p[r].opacity != GetOpacityPixelComponent(q) )
+ if ( ( p[r].red != GetPixelRed(q) )
+ || ( p[r].green != GetPixelGreen(q) )
+ || ( p[r].blue != GetPixelBlue(q) )
+ || ( p[r].opacity != GetPixelOpacity(q) )
|| ( image->colorspace == CMYKColorspace &&
- GetIndexPixelComponent(p_indexes+r) != GetIndexPixelComponent(q_indexes+x) ) )
+ GetPixelIndex(p_indexes+r) != GetPixelIndex(q_indexes+x) ) )
changed++; /* The pixel was changed in some way! */
p--; /* go backward through pixel buffers */
diff --git a/magick/nt-feature.c b/magick/nt-feature.c
index 4499119..da34633 100644
--- a/magick/nt-feature.c
+++ b/magick/nt-feature.c
@@ -200,9 +200,9 @@
/* Transfer pixels, scaling to Quantum */
for( x=(ssize_t) page.width ; x> 0 ; x-- )
{
- q->rgbRed = ScaleQuantumToChar(GetRedPixelComponent(p));
- q->rgbGreen = ScaleQuantumToChar(GetGreenPixelComponent(p));
- q->rgbBlue = ScaleQuantumToChar(GetBluePixelComponent(p));
+ q->rgbRed = ScaleQuantumToChar(GetPixelRed(p));
+ q->rgbGreen = ScaleQuantumToChar(GetPixelGreen(p));
+ q->rgbBlue = ScaleQuantumToChar(GetPixelBlue(p));
q->rgbReserved = 0;
++q;
++p;
@@ -644,9 +644,9 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- q->rgbRed=ScaleQuantumToChar(GetRedPixelComponent(p));
- q->rgbGreen=ScaleQuantumToChar(GetGreenPixelComponent(p));
- q->rgbBlue=ScaleQuantumToChar(GetBluePixelComponent(p));
+ q->rgbRed=ScaleQuantumToChar(GetPixelRed(p));
+ q->rgbGreen=ScaleQuantumToChar(GetPixelGreen(p));
+ q->rgbBlue=ScaleQuantumToChar(GetPixelBlue(p));
q->rgbReserved=0;
p++;
q++;
diff --git a/magick/paint.c b/magick/paint.c
index a9d020e..372812a 100644
--- a/magick/paint.c
+++ b/magick/paint.c
@@ -341,23 +341,23 @@
indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetOpacityPixelComponent(p) != OpaqueOpacity)
+ if (GetPixelOpacity(p) != OpaqueOpacity)
{
(void) GetFillColor(draw_info,x,y,&fill_color);
SetMagickPixelPacket(image,&fill_color,(IndexPacket *) NULL,&fill);
if (image->colorspace == CMYKColorspace)
ConvertRGBToCMYK(&fill);
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(fill.red));
+ SetPixelRed(q,ClampToQuantum(fill.red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(fill.green));
+ SetPixelGreen(q,ClampToQuantum(fill.green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(fill.blue));
+ SetPixelBlue(q,ClampToQuantum(fill.blue));
if ((channel & OpacityChannel) != 0)
- SetOpacityPixelComponent(q,ClampToQuantum(fill.opacity));
+ SetPixelOpacity(q,ClampToQuantum(fill.opacity));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(indexes+x,ClampToQuantum(fill.index));
+ SetPixelIndex(indexes+x,ClampToQuantum(fill.index));
}
p++;
q++;
@@ -687,7 +687,7 @@
}
*q=(*(p+j));
if (image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(paint_indexes+x,GetIndexPixelComponent(
+ SetPixelIndex(paint_indexes+x,GetPixelIndex(
indexes+x+j));
p++;
q++;
@@ -838,16 +838,16 @@
if (IsMagickColorSimilar(&pixel,target) != invert)
{
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(fill->red));
+ SetPixelRed(q,ClampToQuantum(fill->red));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(fill->green));
+ SetPixelGreen(q,ClampToQuantum(fill->green));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(fill->blue));
+ SetPixelBlue(q,ClampToQuantum(fill->blue));
if ((channel & OpacityChannel) != 0)
- SetOpacityPixelComponent(q,ClampToQuantum(fill->opacity));
+ SetPixelOpacity(q,ClampToQuantum(fill->opacity));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(indexes+x,ClampToQuantum(fill->index));
+ SetPixelIndex(indexes+x,ClampToQuantum(fill->index));
}
q++;
}
diff --git a/magick/pixel-private.h b/magick/pixel-private.h
index a4ca551..4dfd038 100644
--- a/magick/pixel-private.h
+++ b/magick/pixel-private.h
@@ -45,8 +45,8 @@
static inline MagickBooleanType IsGrayPixel(const PixelPacket *pixel)
{
#if !defined(MAGICKCORE_HDRI_SUPPORT)
- if ((GetRedPixelComponent(pixel) == GetGreenPixelComponent(pixel)) &&
- (GetGreenPixelComponent(pixel) == GetBluePixelComponent(pixel)))
+ if ((GetPixelRed(pixel) == GetPixelGreen(pixel)) &&
+ (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
return(MagickTrue);
#else
{
@@ -54,8 +54,8 @@
alpha,
beta;
- alpha=GetRedPixelComponent(pixel)-GetGreenPixelComponent(pixel);
- beta=GetGreenPixelComponent(pixel)-GetBluePixelComponent(pixel);
+ alpha=GetPixelRed(pixel)-GetPixelGreen(pixel);
+ beta=GetPixelGreen(pixel)-GetPixelBlue(pixel);
if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
return(MagickTrue);
}
@@ -66,10 +66,10 @@
static inline MagickBooleanType IsMonochromePixel(const PixelPacket *pixel)
{
#if !defined(MAGICKCORE_HDRI_SUPPORT)
- if (((GetRedPixelComponent(pixel) == 0) ||
- (GetRedPixelComponent(pixel) == (Quantum) QuantumRange)) &&
- (GetRedPixelComponent(pixel) == GetGreenPixelComponent(pixel)) &&
- (GetGreenPixelComponent(pixel) == GetBluePixelComponent(pixel)))
+ if (((GetPixelRed(pixel) == 0) ||
+ (GetPixelRed(pixel) == (Quantum) QuantumRange)) &&
+ (GetPixelRed(pixel) == GetPixelGreen(pixel)) &&
+ (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
return(MagickTrue);
#else
{
@@ -77,10 +77,10 @@
alpha,
beta;
- alpha=GetRedPixelComponent(pixel)-GetGreenPixelComponent(pixel);
- beta=GetGreenPixelComponent(pixel)-GetBluePixelComponent(pixel);
- if (((fabs(GetRedPixelComponent(pixel)) <= MagickEpsilon) ||
- (fabs(GetRedPixelComponent(pixel)-QuantumRange) <= MagickEpsilon)) &&
+ alpha=GetPixelRed(pixel)-GetPixelGreen(pixel);
+ beta=GetPixelGreen(pixel)-GetPixelBlue(pixel);
+ if (((fabs(GetPixelRed(pixel)) <= MagickEpsilon) ||
+ (fabs(GetPixelRed(pixel)-QuantumRange) <= MagickEpsilon)) &&
(fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
return(MagickTrue);
}
@@ -91,13 +91,13 @@
static inline void SetMagickPixelPacket(const Image *image,
const PixelPacket *color,const IndexPacket *index,MagickPixelPacket *pixel)
{
- pixel->red=(MagickRealType) GetRedPixelComponent(color);
- pixel->green=(MagickRealType) GetGreenPixelComponent(color);
- pixel->blue=(MagickRealType) GetBluePixelComponent(color);
- pixel->opacity=(MagickRealType) GetOpacityPixelComponent(color);
+ pixel->red=(MagickRealType) GetPixelRed(color);
+ pixel->green=(MagickRealType) GetPixelGreen(color);
+ pixel->blue=(MagickRealType) GetPixelBlue(color);
+ pixel->opacity=(MagickRealType) GetPixelOpacity(color);
if ((image->colorspace == CMYKColorspace) &&
(index != (const IndexPacket *) NULL))
- pixel->index=(MagickRealType) GetIndexPixelComponent(index);
+ pixel->index=(MagickRealType) GetPixelIndex(index);
}
static inline void SetMagickPixelPacketBias(const Image *image,
@@ -116,13 +116,13 @@
static inline void SetPixelPacket(const Image *image,
const MagickPixelPacket *pixel,PixelPacket *color,IndexPacket *index)
{
- SetRedPixelComponent(color,ClampToQuantum(pixel->red));
- SetGreenPixelComponent(color,ClampToQuantum(pixel->green));
- SetBluePixelComponent(color,ClampToQuantum(pixel->blue));
- SetOpacityPixelComponent(color,ClampToQuantum(pixel->opacity));
+ SetPixelRed(color,ClampToQuantum(pixel->red));
+ SetPixelGreen(color,ClampToQuantum(pixel->green));
+ SetPixelBlue(color,ClampToQuantum(pixel->blue));
+ SetPixelOpacity(color,ClampToQuantum(pixel->opacity));
if ((image->colorspace == CMYKColorspace) ||
(image->storage_class == PseudoClass))
- SetIndexPixelComponent(index,ClampToQuantum(pixel->index));
+ SetPixelIndex(index,ClampToQuantum(pixel->index));
}
#if defined(__cplusplus) || defined(c_plusplus)
diff --git a/magick/pixel.c b/magick/pixel.c
index 999b42d..c6c95d0 100644
--- a/magick/pixel.c
+++ b/magick/pixel.c
@@ -271,9 +271,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
- *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(p));
p++;
}
}
@@ -288,10 +288,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
- *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
- *q++=ScaleQuantumToChar((Quantum) (GetAlphaPixelComponent(p)));
+ *q++=ScaleQuantumToChar(GetPixelBlue(p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(p));
+ *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
p++;
}
}
@@ -306,9 +306,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
- *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(p));
*q++=ScaleQuantumToChar((Quantum) 0);
p++;
}
@@ -339,9 +339,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
- *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(p));
p++;
}
}
@@ -356,10 +356,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
- *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
- *q++=ScaleQuantumToChar((Quantum) (GetAlphaPixelComponent(p)));
+ *q++=ScaleQuantumToChar(GetPixelRed(p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(p));
+ *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
p++;
}
}
@@ -374,9 +374,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
- *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(p));
*q++=ScaleQuantumToChar((Quantum) 0);
p++;
}
@@ -399,35 +399,35 @@
case RedQuantum:
case CyanQuantum:
{
- *q=ScaleQuantumToChar(GetRedPixelComponent(p));
+ *q=ScaleQuantumToChar(GetPixelRed(p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=ScaleQuantumToChar(GetGreenPixelComponent(p));
+ *q=ScaleQuantumToChar(GetPixelGreen(p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=ScaleQuantumToChar(GetBluePixelComponent(p));
+ *q=ScaleQuantumToChar(GetPixelBlue(p));
break;
}
case AlphaQuantum:
{
- *q=ScaleQuantumToChar((Quantum) (GetAlphaPixelComponent(p)));
+ *q=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
break;
}
case OpacityQuantum:
{
- *q=ScaleQuantumToChar(GetOpacityPixelComponent(p));
+ *q=ScaleQuantumToChar(GetPixelOpacity(p));
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=ScaleQuantumToChar(GetIndexPixelComponent(indexes+x));
+ *q=ScaleQuantumToChar(GetPixelIndex(indexes+x));
break;
}
case IndexQuantum:
@@ -460,9 +460,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(double) (QuantumScale*GetBluePixelComponent(p));
- *q++=(double) (QuantumScale*GetGreenPixelComponent(p));
- *q++=(double) (QuantumScale*GetRedPixelComponent(p));
+ *q++=(double) (QuantumScale*GetPixelBlue(p));
+ *q++=(double) (QuantumScale*GetPixelGreen(p));
+ *q++=(double) (QuantumScale*GetPixelRed(p));
p++;
}
}
@@ -477,11 +477,11 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(double) (QuantumScale*GetBluePixelComponent(p));
- *q++=(double) (QuantumScale*GetGreenPixelComponent(p));
- *q++=(double) (QuantumScale*GetRedPixelComponent(p));
+ *q++=(double) (QuantumScale*GetPixelBlue(p));
+ *q++=(double) (QuantumScale*GetPixelGreen(p));
+ *q++=(double) (QuantumScale*GetPixelRed(p));
*q++=(double) (QuantumScale*((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p))));
+ GetPixelOpacity(p))));
p++;
}
}
@@ -496,9 +496,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(double) (QuantumScale*GetBluePixelComponent(p));
- *q++=(double) (QuantumScale*GetGreenPixelComponent(p));
- *q++=(double) (QuantumScale*GetRedPixelComponent(p));
+ *q++=(double) (QuantumScale*GetPixelBlue(p));
+ *q++=(double) (QuantumScale*GetPixelGreen(p));
+ *q++=(double) (QuantumScale*GetPixelRed(p));
*q++=0.0;
p++;
}
@@ -529,9 +529,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(double) (QuantumScale*GetRedPixelComponent(p));
- *q++=(double) (QuantumScale*GetGreenPixelComponent(p));
- *q++=(double) (QuantumScale*GetBluePixelComponent(p));
+ *q++=(double) (QuantumScale*GetPixelRed(p));
+ *q++=(double) (QuantumScale*GetPixelGreen(p));
+ *q++=(double) (QuantumScale*GetPixelBlue(p));
p++;
}
}
@@ -546,11 +546,11 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(double) (QuantumScale*GetRedPixelComponent(p));
- *q++=(double) (QuantumScale*GetGreenPixelComponent(p));
- *q++=(double) (QuantumScale*GetBluePixelComponent(p));
+ *q++=(double) (QuantumScale*GetPixelRed(p));
+ *q++=(double) (QuantumScale*GetPixelGreen(p));
+ *q++=(double) (QuantumScale*GetPixelBlue(p));
*q++=(double) (QuantumScale*((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p))));
+ GetPixelOpacity(p))));
p++;
}
}
@@ -565,9 +565,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(double) (QuantumScale*GetRedPixelComponent(p));
- *q++=(double) (QuantumScale*GetGreenPixelComponent(p));
- *q++=(double) (QuantumScale*GetBluePixelComponent(p));
+ *q++=(double) (QuantumScale*GetPixelRed(p));
+ *q++=(double) (QuantumScale*GetPixelGreen(p));
+ *q++=(double) (QuantumScale*GetPixelBlue(p));
*q++=0.0;
p++;
}
@@ -590,36 +590,36 @@
case RedQuantum:
case CyanQuantum:
{
- *q=(double) (QuantumScale*GetRedPixelComponent(p));
+ *q=(double) (QuantumScale*GetPixelRed(p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=(double) (QuantumScale*GetGreenPixelComponent(p));
+ *q=(double) (QuantumScale*GetPixelGreen(p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=(double) (QuantumScale*GetBluePixelComponent(p));
+ *q=(double) (QuantumScale*GetPixelBlue(p));
break;
}
case AlphaQuantum:
{
*q=(double) (QuantumScale*((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p))));
+ GetPixelOpacity(p))));
break;
}
case OpacityQuantum:
{
- *q=(double) (QuantumScale*GetOpacityPixelComponent(p));
+ *q=(double) (QuantumScale*GetPixelOpacity(p));
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=(double) (QuantumScale*GetIndexPixelComponent(indexes+x));
+ *q=(double) (QuantumScale*GetPixelIndex(indexes+x));
break;
}
case IndexQuantum:
@@ -652,9 +652,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(float) (QuantumScale*GetBluePixelComponent(p));
- *q++=(float) (QuantumScale*GetGreenPixelComponent(p));
- *q++=(float) (QuantumScale*GetRedPixelComponent(p));
+ *q++=(float) (QuantumScale*GetPixelBlue(p));
+ *q++=(float) (QuantumScale*GetPixelGreen(p));
+ *q++=(float) (QuantumScale*GetPixelRed(p));
p++;
}
}
@@ -669,10 +669,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(float) (QuantumScale*GetBluePixelComponent(p));
- *q++=(float) (QuantumScale*GetGreenPixelComponent(p));
- *q++=(float) (QuantumScale*GetRedPixelComponent(p));
- *q++=(float) (QuantumScale*(Quantum) (GetAlphaPixelComponent(p)));
+ *q++=(float) (QuantumScale*GetPixelBlue(p));
+ *q++=(float) (QuantumScale*GetPixelGreen(p));
+ *q++=(float) (QuantumScale*GetPixelRed(p));
+ *q++=(float) (QuantumScale*(Quantum) (GetPixelAlpha(p)));
p++;
}
}
@@ -687,9 +687,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(float) (QuantumScale*GetBluePixelComponent(p));
- *q++=(float) (QuantumScale*GetGreenPixelComponent(p));
- *q++=(float) (QuantumScale*GetRedPixelComponent(p));
+ *q++=(float) (QuantumScale*GetPixelBlue(p));
+ *q++=(float) (QuantumScale*GetPixelGreen(p));
+ *q++=(float) (QuantumScale*GetPixelRed(p));
*q++=0.0;
p++;
}
@@ -720,9 +720,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(float) (QuantumScale*GetRedPixelComponent(p));
- *q++=(float) (QuantumScale*GetGreenPixelComponent(p));
- *q++=(float) (QuantumScale*GetBluePixelComponent(p));
+ *q++=(float) (QuantumScale*GetPixelRed(p));
+ *q++=(float) (QuantumScale*GetPixelGreen(p));
+ *q++=(float) (QuantumScale*GetPixelBlue(p));
p++;
}
}
@@ -737,10 +737,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(float) (QuantumScale*GetRedPixelComponent(p));
- *q++=(float) (QuantumScale*GetGreenPixelComponent(p));
- *q++=(float) (QuantumScale*GetBluePixelComponent(p));
- *q++=(float) (QuantumScale*((Quantum) (GetAlphaPixelComponent(p))));
+ *q++=(float) (QuantumScale*GetPixelRed(p));
+ *q++=(float) (QuantumScale*GetPixelGreen(p));
+ *q++=(float) (QuantumScale*GetPixelBlue(p));
+ *q++=(float) (QuantumScale*((Quantum) (GetPixelAlpha(p))));
p++;
}
}
@@ -755,9 +755,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(float) (QuantumScale*GetRedPixelComponent(p));
- *q++=(float) (QuantumScale*GetGreenPixelComponent(p));
- *q++=(float) (QuantumScale*GetBluePixelComponent(p));
+ *q++=(float) (QuantumScale*GetPixelRed(p));
+ *q++=(float) (QuantumScale*GetPixelGreen(p));
+ *q++=(float) (QuantumScale*GetPixelBlue(p));
*q++=0.0;
p++;
}
@@ -780,35 +780,35 @@
case RedQuantum:
case CyanQuantum:
{
- *q=(float) (QuantumScale*GetRedPixelComponent(p));
+ *q=(float) (QuantumScale*GetPixelRed(p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=(float) (QuantumScale*GetGreenPixelComponent(p));
+ *q=(float) (QuantumScale*GetPixelGreen(p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=(float) (QuantumScale*GetBluePixelComponent(p));
+ *q=(float) (QuantumScale*GetPixelBlue(p));
break;
}
case AlphaQuantum:
{
- *q=(float) (QuantumScale*((Quantum) (GetAlphaPixelComponent(p))));
+ *q=(float) (QuantumScale*((Quantum) (GetPixelAlpha(p))));
break;
}
case OpacityQuantum:
{
- *q=(float) (QuantumScale*GetOpacityPixelComponent(p));
+ *q=(float) (QuantumScale*GetPixelOpacity(p));
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=(float) (QuantumScale*GetIndexPixelComponent(indexes+x));
+ *q=(float) (QuantumScale*GetPixelIndex(indexes+x));
break;
}
case IndexQuantum:
@@ -841,9 +841,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
p++;
}
}
@@ -858,11 +858,11 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
*q++=(unsigned int) ScaleQuantumToLong((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
p++;
}
}
@@ -877,9 +877,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
*q++=0U;
p++;
}
@@ -911,9 +911,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
p++;
}
}
@@ -928,11 +928,11 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
*q++=(unsigned int) ScaleQuantumToLong((Quantum)
- (GetAlphaPixelComponent(p)));
+ (GetPixelAlpha(p)));
p++;
}
}
@@ -947,9 +947,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
*q++=0U;
p++;
}
@@ -972,36 +972,36 @@
case RedQuantum:
case CyanQuantum:
{
- *q=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
break;
}
case AlphaQuantum:
{
*q=(unsigned int) ScaleQuantumToLong((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
break;
}
case OpacityQuantum:
{
- *q=(unsigned int) ScaleQuantumToLong(GetOpacityPixelComponent(p));
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelOpacity(p));
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=(unsigned int) ScaleQuantumToLong(GetIndexPixelComponent(indexes+x));
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelIndex(indexes+x));
break;
}
case IndexQuantum:
@@ -1035,9 +1035,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
- *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=ScaleQuantumToLong(GetPixelRed(p));
p++;
}
}
@@ -1052,10 +1052,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
- *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
- *q++=ScaleQuantumToLong((Quantum) (GetAlphaPixelComponent(p)));
+ *q++=ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=ScaleQuantumToLong(GetPixelRed(p));
+ *q++=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
p++;
}
}
@@ -1070,9 +1070,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
- *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=ScaleQuantumToLong(GetPixelRed(p));
*q++=0;
p++;
}
@@ -1103,9 +1103,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
- *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
+ *q++=ScaleQuantumToLong(GetPixelRed(p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(p));
p++;
}
}
@@ -1120,10 +1120,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
- *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
- *q++=ScaleQuantumToLong((Quantum) (GetAlphaPixelComponent(p)));
+ *q++=ScaleQuantumToLong(GetPixelRed(p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
p++;
}
}
@@ -1138,9 +1138,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
- *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
+ *q++=ScaleQuantumToLong(GetPixelRed(p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(p));
*q++=0;
p++;
}
@@ -1163,35 +1163,35 @@
case RedQuantum:
case CyanQuantum:
{
- *q=ScaleQuantumToLong(GetRedPixelComponent(p));
+ *q=ScaleQuantumToLong(GetPixelRed(p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=ScaleQuantumToLong(GetGreenPixelComponent(p));
+ *q=ScaleQuantumToLong(GetPixelGreen(p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=ScaleQuantumToLong(GetBluePixelComponent(p));
+ *q=ScaleQuantumToLong(GetPixelBlue(p));
break;
}
case AlphaQuantum:
{
- *q=ScaleQuantumToLong((Quantum) (GetAlphaPixelComponent(p)));
+ *q=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
break;
}
case OpacityQuantum:
{
- *q=ScaleQuantumToLong(GetOpacityPixelComponent(p));
+ *q=ScaleQuantumToLong(GetPixelOpacity(p));
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=ScaleQuantumToLong(GetIndexPixelComponent(indexes+x));
+ *q=ScaleQuantumToLong(GetPixelIndex(indexes+x));
break;
}
case IndexQuantum:
@@ -1224,9 +1224,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=GetBluePixelComponent(p);
- *q++=GetGreenPixelComponent(p);
- *q++=GetRedPixelComponent(p);
+ *q++=GetPixelBlue(p);
+ *q++=GetPixelGreen(p);
+ *q++=GetPixelRed(p);
p++;
}
}
@@ -1241,10 +1241,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=GetBluePixelComponent(p);
- *q++=GetGreenPixelComponent(p);
- *q++=GetRedPixelComponent(p);
- *q++=(Quantum) (GetAlphaPixelComponent(p));
+ *q++=GetPixelBlue(p);
+ *q++=GetPixelGreen(p);
+ *q++=GetPixelRed(p);
+ *q++=(Quantum) (GetPixelAlpha(p));
p++;
}
}
@@ -1259,9 +1259,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=GetBluePixelComponent(p);
- *q++=GetGreenPixelComponent(p);
- *q++=GetRedPixelComponent(p);
+ *q++=GetPixelBlue(p);
+ *q++=GetPixelGreen(p);
+ *q++=GetPixelRed(p);
*q++=(Quantum) 0;
p++;
}
@@ -1292,9 +1292,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=GetRedPixelComponent(p);
- *q++=GetGreenPixelComponent(p);
- *q++=GetBluePixelComponent(p);
+ *q++=GetPixelRed(p);
+ *q++=GetPixelGreen(p);
+ *q++=GetPixelBlue(p);
p++;
}
}
@@ -1309,10 +1309,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=GetRedPixelComponent(p);
- *q++=GetGreenPixelComponent(p);
- *q++=GetBluePixelComponent(p);
- *q++=(Quantum) (GetAlphaPixelComponent(p));
+ *q++=GetPixelRed(p);
+ *q++=GetPixelGreen(p);
+ *q++=GetPixelBlue(p);
+ *q++=(Quantum) (GetPixelAlpha(p));
p++;
}
}
@@ -1327,9 +1327,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=GetRedPixelComponent(p);
- *q++=GetGreenPixelComponent(p);
- *q++=GetBluePixelComponent(p);
+ *q++=GetPixelRed(p);
+ *q++=GetPixelGreen(p);
+ *q++=GetPixelBlue(p);
*q++=(Quantum) 0;
p++;
}
@@ -1352,35 +1352,35 @@
case RedQuantum:
case CyanQuantum:
{
- *q=GetRedPixelComponent(p);
+ *q=GetPixelRed(p);
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=GetGreenPixelComponent(p);
+ *q=GetPixelGreen(p);
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=GetBluePixelComponent(p);
+ *q=GetPixelBlue(p);
break;
}
case AlphaQuantum:
{
- *q=(Quantum) (GetAlphaPixelComponent(p));
+ *q=(Quantum) (GetPixelAlpha(p));
break;
}
case OpacityQuantum:
{
- *q=GetOpacityPixelComponent(p);
+ *q=GetPixelOpacity(p);
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=GetIndexPixelComponent(indexes+x);
+ *q=GetPixelIndex(indexes+x);
break;
}
case IndexQuantum:
@@ -1413,9 +1413,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
- *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(p));
+ *q++=ScaleQuantumToShort(GetPixelRed(p));
p++;
}
}
@@ -1430,10 +1430,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
- *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
- *q++=ScaleQuantumToShort((Quantum) (GetAlphaPixelComponent(p)));
+ *q++=ScaleQuantumToShort(GetPixelBlue(p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(p));
+ *q++=ScaleQuantumToShort(GetPixelRed(p));
+ *q++=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
p++;
}
}
@@ -1448,9 +1448,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
- *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(p));
+ *q++=ScaleQuantumToShort(GetPixelRed(p));
*q++=0;
p++;
}
@@ -1481,9 +1481,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
- *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
+ *q++=ScaleQuantumToShort(GetPixelRed(p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(p));
p++;
}
}
@@ -1498,10 +1498,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
- *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
- *q++=ScaleQuantumToShort((Quantum) (GetAlphaPixelComponent(p)));
+ *q++=ScaleQuantumToShort(GetPixelRed(p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(p));
+ *q++=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
p++;
}
}
@@ -1516,9 +1516,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
- *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
+ *q++=ScaleQuantumToShort(GetPixelRed(p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(p));
*q++=0;
p++;
}
@@ -1541,35 +1541,35 @@
case RedQuantum:
case CyanQuantum:
{
- *q=ScaleQuantumToShort(GetRedPixelComponent(p));
+ *q=ScaleQuantumToShort(GetPixelRed(p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=ScaleQuantumToShort(GetGreenPixelComponent(p));
+ *q=ScaleQuantumToShort(GetPixelGreen(p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=ScaleQuantumToShort(GetBluePixelComponent(p));
+ *q=ScaleQuantumToShort(GetPixelBlue(p));
break;
}
case AlphaQuantum:
{
- *q=ScaleQuantumToShort((Quantum) (GetAlphaPixelComponent(p)));
+ *q=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
break;
}
case OpacityQuantum:
{
- *q=ScaleQuantumToShort(GetOpacityPixelComponent(p));
+ *q=ScaleQuantumToShort(GetPixelOpacity(p));
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=ScaleQuantumToShort(GetIndexPixelComponent(indexes+x));
+ *q=ScaleQuantumToShort(GetPixelIndex(indexes+x));
break;
}
case IndexQuantum:
@@ -1843,9 +1843,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
- SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
+ SetPixelBlue(q,ScaleCharToQuantum(*p++));
+ SetPixelGreen(q,ScaleCharToQuantum(*p++));
+ SetPixelRed(q,ScaleCharToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1862,10 +1862,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
- SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
- SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++));
+ SetPixelBlue(q,ScaleCharToQuantum(*p++));
+ SetPixelGreen(q,ScaleCharToQuantum(*p++));
+ SetPixelRed(q,ScaleCharToQuantum(*p++));
+ SetPixelAlpha(q,ScaleCharToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1882,10 +1882,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
- SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
- SetOpacityPixelComponent(q,ScaleCharToQuantum(*p++));
+ SetPixelBlue(q,ScaleCharToQuantum(*p++));
+ SetPixelGreen(q,ScaleCharToQuantum(*p++));
+ SetPixelRed(q,ScaleCharToQuantum(*p++));
+ SetPixelOpacity(q,ScaleCharToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1902,9 +1902,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
- SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
+ SetPixelBlue(q,ScaleCharToQuantum(*p++));
+ SetPixelGreen(q,ScaleCharToQuantum(*p++));
+ SetPixelRed(q,ScaleCharToQuantum(*p++));
p++;
q++;
}
@@ -1922,9 +1922,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleCharToQuantum(*p++));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1941,9 +1941,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
- SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
+ SetPixelRed(q,ScaleCharToQuantum(*p++));
+ SetPixelGreen(q,ScaleCharToQuantum(*p++));
+ SetPixelBlue(q,ScaleCharToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1960,10 +1960,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
- SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
- SetAlphaPixelComponent(q,ScaleCharToQuantum(*p++));
+ SetPixelRed(q,ScaleCharToQuantum(*p++));
+ SetPixelGreen(q,ScaleCharToQuantum(*p++));
+ SetPixelBlue(q,ScaleCharToQuantum(*p++));
+ SetPixelAlpha(q,ScaleCharToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1980,10 +1980,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
- SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
- SetOpacityPixelComponent(q,ScaleCharToQuantum(*p++));
+ SetPixelRed(q,ScaleCharToQuantum(*p++));
+ SetPixelGreen(q,ScaleCharToQuantum(*p++));
+ SetPixelBlue(q,ScaleCharToQuantum(*p++));
+ SetPixelOpacity(q,ScaleCharToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2000,9 +2000,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleCharToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleCharToQuantum(*p++));
- SetBluePixelComponent(q,ScaleCharToQuantum(*p++));
+ SetPixelRed(q,ScaleCharToQuantum(*p++));
+ SetPixelGreen(q,ScaleCharToQuantum(*p++));
+ SetPixelBlue(q,ScaleCharToQuantum(*p++));
p++;
q++;
}
@@ -2026,41 +2026,41 @@
case RedQuantum:
case CyanQuantum:
{
- SetRedPixelComponent(q,ScaleCharToQuantum(*p));
+ SetPixelRed(q,ScaleCharToQuantum(*p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- SetGreenPixelComponent(q,ScaleCharToQuantum(*p));
+ SetPixelGreen(q,ScaleCharToQuantum(*p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- SetBluePixelComponent(q,ScaleCharToQuantum(*p));
+ SetPixelBlue(q,ScaleCharToQuantum(*p));
break;
}
case AlphaQuantum:
{
- SetAlphaPixelComponent(q,ScaleCharToQuantum(*p));
+ SetPixelAlpha(q,ScaleCharToQuantum(*p));
break;
}
case OpacityQuantum:
{
- SetOpacityPixelComponent(q,ScaleCharToQuantum(*p));
+ SetPixelOpacity(q,ScaleCharToQuantum(*p));
break;
}
case BlackQuantum:
{
- SetIndexPixelComponent(indexes+x,ScaleCharToQuantum(*p));
+ SetPixelIndex(indexes+x,ScaleCharToQuantum(*p));
break;
}
case IndexQuantum:
{
- SetRedPixelComponent(q,ScaleCharToQuantum(*p));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleCharToQuantum(*p));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
break;
}
default:
@@ -2090,13 +2090,13 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
q++;
@@ -2115,13 +2115,13 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
q->opacity=(Quantum) QuantumRange-ClampToQuantum((MagickRealType)
@@ -2143,13 +2143,13 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
p++;
@@ -2169,10 +2169,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p++;
q++;
}
@@ -2190,12 +2190,12 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*(*p)));
+ SetPixelGreen(q,ClampToQuantum((MagickRealType) QuantumRange*(*p)));
p++;
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType) QuantumRange*(*p)));
+ SetPixelBlue(q,ClampToQuantum((MagickRealType) QuantumRange*(*p)));
p++;
q++;
}
@@ -2213,16 +2213,16 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelAlpha(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
q++;
@@ -2241,13 +2241,13 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
q++;
@@ -2272,48 +2272,48 @@
case RedQuantum:
case CyanQuantum:
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
break;
}
case AlphaQuantum:
{
- SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelAlpha(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
break;
}
case OpacityQuantum:
{
- SetOpacityPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelOpacity(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
break;
}
case BlackQuantum:
{
- SetIndexPixelComponent(indexes+x,ClampToQuantum(
+ SetPixelIndex(indexes+x,ClampToQuantum(
(MagickRealType) QuantumRange*(*p)));
break;
}
case IndexQuantum:
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
break;
}
default:
@@ -2343,13 +2343,13 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
q++;
@@ -2368,16 +2368,16 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelAlpha(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
q++;
@@ -2396,13 +2396,13 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
p++;
@@ -2422,10 +2422,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p++;
q++;
}
@@ -2443,13 +2443,13 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
q++;
@@ -2468,16 +2468,16 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelAlpha(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
q++;
@@ -2496,13 +2496,13 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
p++;
q++;
@@ -2527,48 +2527,48 @@
case RedQuantum:
case CyanQuantum:
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
break;
}
case AlphaQuantum:
{
- SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelAlpha(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
break;
}
case OpacityQuantum:
{
- SetOpacityPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelOpacity(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
break;
}
case BlackQuantum:
{
- SetIndexPixelComponent(indexes+x,ClampToQuantum(
+ SetPixelIndex(indexes+x,ClampToQuantum(
(MagickRealType) QuantumRange*(*p)));
break;
}
case IndexQuantum:
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*(*p)));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
break;
}
default:
@@ -2598,9 +2598,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
- SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
+ SetPixelBlue(q,ScaleLongToQuantum(*p++));
+ SetPixelGreen(q,ScaleLongToQuantum(*p++));
+ SetPixelRed(q,ScaleLongToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2617,10 +2617,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
- SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
- SetAlphaPixelComponent(q,ScaleLongToQuantum(*p++));
+ SetPixelBlue(q,ScaleLongToQuantum(*p++));
+ SetPixelGreen(q,ScaleLongToQuantum(*p++));
+ SetPixelRed(q,ScaleLongToQuantum(*p++));
+ SetPixelAlpha(q,ScaleLongToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2637,9 +2637,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
- SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
+ SetPixelBlue(q,ScaleLongToQuantum(*p++));
+ SetPixelGreen(q,ScaleLongToQuantum(*p++));
+ SetPixelRed(q,ScaleLongToQuantum(*p++));
p++;
q++;
}
@@ -2657,9 +2657,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleLongToQuantum(*p++));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2676,9 +2676,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
- SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
+ SetPixelRed(q,ScaleLongToQuantum(*p++));
+ SetPixelGreen(q,ScaleLongToQuantum(*p++));
+ SetPixelBlue(q,ScaleLongToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2695,10 +2695,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
- SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
- SetAlphaPixelComponent(q,ScaleLongToQuantum(*p++));
+ SetPixelRed(q,ScaleLongToQuantum(*p++));
+ SetPixelGreen(q,ScaleLongToQuantum(*p++));
+ SetPixelBlue(q,ScaleLongToQuantum(*p++));
+ SetPixelAlpha(q,ScaleLongToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2715,9 +2715,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
- SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
+ SetPixelRed(q,ScaleLongToQuantum(*p++));
+ SetPixelGreen(q,ScaleLongToQuantum(*p++));
+ SetPixelBlue(q,ScaleLongToQuantum(*p++));
p++;
q++;
}
@@ -2741,41 +2741,41 @@
case RedQuantum:
case CyanQuantum:
{
- SetRedPixelComponent(q,ScaleLongToQuantum(*p));
+ SetPixelRed(q,ScaleLongToQuantum(*p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- SetGreenPixelComponent(q,ScaleLongToQuantum(*p));
+ SetPixelGreen(q,ScaleLongToQuantum(*p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- SetBluePixelComponent(q,ScaleLongToQuantum(*p));
+ SetPixelBlue(q,ScaleLongToQuantum(*p));
break;
}
case AlphaQuantum:
{
- SetAlphaPixelComponent(q,ScaleLongToQuantum(*p));
+ SetPixelAlpha(q,ScaleLongToQuantum(*p));
break;
}
case OpacityQuantum:
{
- SetOpacityPixelComponent(q,ScaleLongToQuantum(*p));
+ SetPixelOpacity(q,ScaleLongToQuantum(*p));
break;
}
case BlackQuantum:
{
- SetIndexPixelComponent(indexes+x,ScaleLongToQuantum(*p));
+ SetPixelIndex(indexes+x,ScaleLongToQuantum(*p));
break;
}
case IndexQuantum:
{
- SetRedPixelComponent(q,ScaleLongToQuantum(*p));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleLongToQuantum(*p));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
break;
}
default:
@@ -2805,9 +2805,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
- SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
+ SetPixelBlue(q,ScaleLongToQuantum(*p++));
+ SetPixelGreen(q,ScaleLongToQuantum(*p++));
+ SetPixelRed(q,ScaleLongToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2824,10 +2824,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
- SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
- SetAlphaPixelComponent(q,ScaleLongToQuantum(*p++));
+ SetPixelBlue(q,ScaleLongToQuantum(*p++));
+ SetPixelGreen(q,ScaleLongToQuantum(*p++));
+ SetPixelRed(q,ScaleLongToQuantum(*p++));
+ SetPixelAlpha(q,ScaleLongToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2844,9 +2844,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
- SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
+ SetPixelBlue(q,ScaleLongToQuantum(*p++));
+ SetPixelGreen(q,ScaleLongToQuantum(*p++));
+ SetPixelRed(q,ScaleLongToQuantum(*p++));
p++;
q++;
}
@@ -2864,9 +2864,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleLongToQuantum(*p++));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2883,9 +2883,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
- SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
+ SetPixelRed(q,ScaleLongToQuantum(*p++));
+ SetPixelGreen(q,ScaleLongToQuantum(*p++));
+ SetPixelBlue(q,ScaleLongToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2902,10 +2902,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
- SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
- SetAlphaPixelComponent(q,ScaleLongToQuantum(*p++));
+ SetPixelRed(q,ScaleLongToQuantum(*p++));
+ SetPixelGreen(q,ScaleLongToQuantum(*p++));
+ SetPixelBlue(q,ScaleLongToQuantum(*p++));
+ SetPixelAlpha(q,ScaleLongToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -2922,9 +2922,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleLongToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleLongToQuantum(*p++));
- SetBluePixelComponent(q,ScaleLongToQuantum(*p++));
+ SetPixelRed(q,ScaleLongToQuantum(*p++));
+ SetPixelGreen(q,ScaleLongToQuantum(*p++));
+ SetPixelBlue(q,ScaleLongToQuantum(*p++));
p++;
q++;
}
@@ -2948,41 +2948,41 @@
case RedQuantum:
case CyanQuantum:
{
- SetRedPixelComponent(q,ScaleLongToQuantum(*p));
+ SetPixelRed(q,ScaleLongToQuantum(*p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- SetGreenPixelComponent(q,ScaleLongToQuantum(*p));
+ SetPixelGreen(q,ScaleLongToQuantum(*p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- SetBluePixelComponent(q,ScaleLongToQuantum(*p));
+ SetPixelBlue(q,ScaleLongToQuantum(*p));
break;
}
case AlphaQuantum:
{
- SetAlphaPixelComponent(q,ScaleLongToQuantum(*p));
+ SetPixelAlpha(q,ScaleLongToQuantum(*p));
break;
}
case OpacityQuantum:
{
- SetOpacityPixelComponent(q,ScaleLongToQuantum(*p));
+ SetPixelOpacity(q,ScaleLongToQuantum(*p));
break;
}
case BlackQuantum:
{
- SetIndexPixelComponent(indexes+x,ScaleLongToQuantum(*p));
+ SetPixelIndex(indexes+x,ScaleLongToQuantum(*p));
break;
}
case IndexQuantum:
{
- SetRedPixelComponent(q,ScaleLongToQuantum(*p));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleLongToQuantum(*p));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
break;
}
default:
@@ -3012,9 +3012,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,*p++);
- SetGreenPixelComponent(q,*p++);
- SetRedPixelComponent(q,*p++);
+ SetPixelBlue(q,*p++);
+ SetPixelGreen(q,*p++);
+ SetPixelRed(q,*p++);
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3031,10 +3031,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,*p++);
- SetGreenPixelComponent(q,*p++);
- SetRedPixelComponent(q,*p++);
- SetAlphaPixelComponent(q,*p++);
+ SetPixelBlue(q,*p++);
+ SetPixelGreen(q,*p++);
+ SetPixelRed(q,*p++);
+ SetPixelAlpha(q,*p++);
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3051,9 +3051,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,*p++);
- SetGreenPixelComponent(q,*p++);
- SetRedPixelComponent(q,*p++);
+ SetPixelBlue(q,*p++);
+ SetPixelGreen(q,*p++);
+ SetPixelRed(q,*p++);
p++;
q++;
}
@@ -3071,9 +3071,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,*p++);
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,*p++);
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3090,9 +3090,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,*p++);
- SetGreenPixelComponent(q,*p++);
- SetBluePixelComponent(q,*p++);
+ SetPixelRed(q,*p++);
+ SetPixelGreen(q,*p++);
+ SetPixelBlue(q,*p++);
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3109,10 +3109,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,*p++);
- SetGreenPixelComponent(q,*p++);
- SetBluePixelComponent(q,*p++);
- SetAlphaPixelComponent(q,*p++);
+ SetPixelRed(q,*p++);
+ SetPixelGreen(q,*p++);
+ SetPixelBlue(q,*p++);
+ SetPixelAlpha(q,*p++);
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3129,9 +3129,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,*p++);
- SetGreenPixelComponent(q,*p++);
- SetBluePixelComponent(q,*p++);
+ SetPixelRed(q,*p++);
+ SetPixelGreen(q,*p++);
+ SetPixelBlue(q,*p++);
p++;
q++;
}
@@ -3155,41 +3155,41 @@
case RedQuantum:
case CyanQuantum:
{
- SetRedPixelComponent(q,*p);
+ SetPixelRed(q,*p);
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- SetGreenPixelComponent(q,*p);
+ SetPixelGreen(q,*p);
break;
}
case BlueQuantum:
case YellowQuantum:
{
- SetBluePixelComponent(q,*p);
+ SetPixelBlue(q,*p);
break;
}
case AlphaQuantum:
{
- SetAlphaPixelComponent(q,*p);
+ SetPixelAlpha(q,*p);
break;
}
case OpacityQuantum:
{
- SetOpacityPixelComponent(q,*p);
+ SetPixelOpacity(q,*p);
break;
}
case BlackQuantum:
{
- SetIndexPixelComponent(indexes+x,*p);
+ SetPixelIndex(indexes+x,*p);
break;
}
case IndexQuantum:
{
- SetRedPixelComponent(q,*p);
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,*p);
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
break;
}
default:
@@ -3219,9 +3219,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ScaleShortToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleShortToQuantum(*p++));
- SetRedPixelComponent(q,ScaleShortToQuantum(*p++));
+ SetPixelBlue(q,ScaleShortToQuantum(*p++));
+ SetPixelGreen(q,ScaleShortToQuantum(*p++));
+ SetPixelRed(q,ScaleShortToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3238,10 +3238,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ScaleShortToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleShortToQuantum(*p++));
- SetRedPixelComponent(q,ScaleShortToQuantum(*p++));
- SetAlphaPixelComponent(q,ScaleShortToQuantum(*p++));
+ SetPixelBlue(q,ScaleShortToQuantum(*p++));
+ SetPixelGreen(q,ScaleShortToQuantum(*p++));
+ SetPixelRed(q,ScaleShortToQuantum(*p++));
+ SetPixelAlpha(q,ScaleShortToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3258,9 +3258,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetBluePixelComponent(q,ScaleShortToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleShortToQuantum(*p++));
- SetRedPixelComponent(q,ScaleShortToQuantum(*p++));
+ SetPixelBlue(q,ScaleShortToQuantum(*p++));
+ SetPixelGreen(q,ScaleShortToQuantum(*p++));
+ SetPixelRed(q,ScaleShortToQuantum(*p++));
p++;
q++;
}
@@ -3278,9 +3278,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleShortToQuantum(*p++));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleShortToQuantum(*p++));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3297,9 +3297,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleShortToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleShortToQuantum(*p++));
- SetBluePixelComponent(q,ScaleShortToQuantum(*p++));
+ SetPixelRed(q,ScaleShortToQuantum(*p++));
+ SetPixelGreen(q,ScaleShortToQuantum(*p++));
+ SetPixelBlue(q,ScaleShortToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3316,10 +3316,10 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleShortToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleShortToQuantum(*p++));
- SetBluePixelComponent(q,ScaleShortToQuantum(*p++));
- SetAlphaPixelComponent(q,ScaleShortToQuantum(*p++));
+ SetPixelRed(q,ScaleShortToQuantum(*p++));
+ SetPixelGreen(q,ScaleShortToQuantum(*p++));
+ SetPixelBlue(q,ScaleShortToQuantum(*p++));
+ SetPixelAlpha(q,ScaleShortToQuantum(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3336,9 +3336,9 @@
break;
for (x=0; x < (ssize_t) columns; x++)
{
- SetRedPixelComponent(q,ScaleShortToQuantum(*p++));
- SetGreenPixelComponent(q,ScaleShortToQuantum(*p++));
- SetBluePixelComponent(q,ScaleShortToQuantum(*p++));
+ SetPixelRed(q,ScaleShortToQuantum(*p++));
+ SetPixelGreen(q,ScaleShortToQuantum(*p++));
+ SetPixelBlue(q,ScaleShortToQuantum(*p++));
p++;
q++;
}
@@ -3362,41 +3362,41 @@
case RedQuantum:
case CyanQuantum:
{
- SetRedPixelComponent(q,ScaleShortToQuantum(*p));
+ SetPixelRed(q,ScaleShortToQuantum(*p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- SetGreenPixelComponent(q,ScaleShortToQuantum(*p));
+ SetPixelGreen(q,ScaleShortToQuantum(*p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- SetBluePixelComponent(q,ScaleShortToQuantum(*p));
+ SetPixelBlue(q,ScaleShortToQuantum(*p));
break;
}
case AlphaQuantum:
{
- SetAlphaPixelComponent(q,ScaleShortToQuantum(*p));
+ SetPixelAlpha(q,ScaleShortToQuantum(*p));
break;
}
case OpacityQuantum:
{
- SetOpacityPixelComponent(q,ScaleShortToQuantum(*p));
+ SetPixelOpacity(q,ScaleShortToQuantum(*p));
break;
}
case BlackQuantum:
{
- SetIndexPixelComponent(indexes+x,ScaleShortToQuantum(*p));
+ SetPixelIndex(indexes+x,ScaleShortToQuantum(*p));
break;
}
case IndexQuantum:
{
- SetRedPixelComponent(q,ScaleShortToQuantum(*p));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleShortToQuantum(*p));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
break;
}
default:
@@ -3469,27 +3469,27 @@
if (image->matte == MagickFalse)
{
*alpha=1.0;
- pixel->red=(MagickRealType) GetRedPixelComponent(color);
- pixel->green=(MagickRealType) GetGreenPixelComponent(color);
- pixel->blue=(MagickRealType) GetBluePixelComponent(color);
- pixel->opacity=(MagickRealType) GetOpacityPixelComponent(color);
+ pixel->red=(MagickRealType) GetPixelRed(color);
+ pixel->green=(MagickRealType) GetPixelGreen(color);
+ pixel->blue=(MagickRealType) GetPixelBlue(color);
+ pixel->opacity=(MagickRealType) GetPixelOpacity(color);
pixel->index=0.0;
if (((image->colorspace == CMYKColorspace) ||
(image->storage_class == PseudoClass)) &&
(indexes != (const IndexPacket *) NULL))
- pixel->index=(MagickRealType) GetIndexPixelComponent(indexes);
+ pixel->index=(MagickRealType) GetPixelIndex(indexes);
return;
}
- *alpha=QuantumScale*GetAlphaPixelComponent(color);
- pixel->red=(*alpha*GetRedPixelComponent(color));
- pixel->green=(*alpha*GetGreenPixelComponent(color));
- pixel->blue=(*alpha*GetBluePixelComponent(color));
- pixel->opacity=(MagickRealType) GetOpacityPixelComponent(color);
+ *alpha=QuantumScale*GetPixelAlpha(color);
+ pixel->red=(*alpha*GetPixelRed(color));
+ pixel->green=(*alpha*GetPixelGreen(color));
+ pixel->blue=(*alpha*GetPixelBlue(color));
+ pixel->opacity=(MagickRealType) GetPixelOpacity(color);
pixel->index=0.0;
if (((image->colorspace == CMYKColorspace) ||
(image->storage_class == PseudoClass)) &&
(indexes != (const IndexPacket *) NULL))
- pixel->index=(*alpha*GetIndexPixelComponent(indexes));
+ pixel->index=(*alpha*GetPixelIndex(indexes));
}
static void BicubicInterpolate(const MagickPixelPacket *pixels,const double dx,
diff --git a/magick/pixel.h b/magick/pixel.h
index 80f4344..8ae1ab2 100644
--- a/magick/pixel.h
+++ b/magick/pixel.h
@@ -25,76 +25,76 @@
#include <magick/colorspace.h>
#include <magick/constitute.h>
-#define ClampRedPixelComponent(pixel) ClampToQuantum((pixel)->red)
-#define ClampGreenPixelComponent(pixel) ClampToQuantum((pixel)->green)
-#define ClampBluePixelComponent(pixel) ClampToQuantum((pixel)->blue)
-#define ClampIndexPixelComponent(indexes) ClampToQuantum(*(indexes))
-#define ClampOpacityPixelComponent(pixel) ClampToQuantum((pixel)->opacity)
-#define GetAlphaPixelComponent(pixel) (QuantumRange-(pixel)->opacity)
-#define GetBlackPixelComponent(indexes) (*(indexes))
-#define GetBluePixelComponent(pixel) ((pixel)->blue)
-#define GetCbPixelComponent(pixel) ((pixel)->green)
-#define GetCrPixelComponent(pixel) ((pixel)->blue)
-#define GetCyanPixelComponent(pixel) ((pixel)->red)
-#define GetGrayPixelComponent(pixel) ((pixel)->red)
-#define GetGreenPixelComponent(pixel) ((pixel)->green)
-#define GetIndexPixelComponent(indexes) (*(indexes))
-#define GetMagentaPixelComponent(pixel) ((pixel)->green)
-#define GetNextPixel(pixel) ((pixel)+1)
-#define GetOpacityPixelComponent(pixel) ((pixel)->opacity)
-#define GetRedPixelComponent(pixel) ((pixel)->red)
-#define GetRGBPixelComponents(pixel,packet) \
+#define ClampPixelRed(pixel) ClampToQuantum((pixel)->red)
+#define ClampPixelGreen(pixel) ClampToQuantum((pixel)->green)
+#define ClampPixelBlue(pixel) ClampToQuantum((pixel)->blue)
+#define ClampPixelIndex(indexes) ClampToQuantum(*(indexes))
+#define ClampPixelOpacity(pixel) ClampToQuantum((pixel)->opacity)
+#define GetPixelAlpha(pixel) (QuantumRange-(pixel)->opacity)
+#define GetPixelBlack(indexes) (*(indexes))
+#define GetPixelBlue(pixel) ((pixel)->blue)
+#define GetPixelCb(pixel) ((pixel)->green)
+#define GetPixelCr(pixel) ((pixel)->blue)
+#define GetPixelCyan(pixel) ((pixel)->red)
+#define GetPixelGray(pixel) ((pixel)->red)
+#define GetPixelGreen(pixel) ((pixel)->green)
+#define GetPixelIndex(indexes) (*(indexes))
+#define GetPixelMagenta(pixel) ((pixel)->green)
+#define GetPixelNext(pixel) ((pixel)+1)
+#define GetPixelOpacity(pixel) ((pixel)->opacity)
+#define GetPixelRed(pixel) ((pixel)->red)
+#define GetPixelRGB(pixel,packet) \
{ \
- (packet)->red=GetRedPixelComponent((pixel)); \
- (packet)->green=GetGreenPixelComponent((pixel)); \
- (packet)->blue=GetBluePixelComponent((pixel)); \
+ (packet)->red=GetPixelRed((pixel)); \
+ (packet)->green=GetPixelGreen((pixel)); \
+ (packet)->blue=GetPixelBlue((pixel)); \
}
-#define GetRGBOPixelComponents(pixel,packet) \
+#define GetPixelRGBO(pixel,packet) \
{ \
- (packet)->red=GetRedPixelComponent((pixel)); \
- (packet)->green=GetGreenPixelComponent((pixel)); \
- (packet)->blue=GetBluePixelComponent((pixel)); \
- (packet)->opacity=GetOpacityPixelComponent((pixel)); \
+ (packet)->red=GetPixelRed((pixel)); \
+ (packet)->green=GetPixelGreen((pixel)); \
+ (packet)->blue=GetPixelBlue((pixel)); \
+ (packet)->opacity=GetPixelOpacity((pixel)); \
}
-#define GetYPixelComponent(pixel) ((pixel)->red)
-#define GetYellowPixelComponent(pixel) ((pixel)->blue)
-#define SetAlphaPixelComponent(pixel,value) \
+#define GetPixelY(pixel) ((pixel)->red)
+#define GetPixelYellow(pixel) ((pixel)->blue)
+#define SetPixelAlpha(pixel,value) \
((pixel)->opacity=(Quantum) (QuantumRange-(value)))
-#define SetBlackPixelComponent(indexes,value) (*(indexes)=(Quantum) (value))
-#define SetBluePixelComponent(pixel,value) ((pixel)->blue=(Quantum) (value))
-#define SetCbPixelComponent(pixel,value) ((pixel)->green=(Quantum) (value))
-#define SetCrPixelComponent(pixel,value) ((pixel)->blue=(Quantum) (value))
-#define SetCyanPixelComponent(pixel,value) ((pixel)->red=(Quantum) (value))
-#define SetGrayPixelComponent(pixel,value) \
+#define SetPixelBlack(indexes,value) (*(indexes)=(Quantum) (value))
+#define SetPixelBlue(pixel,value) ((pixel)->blue=(Quantum) (value))
+#define SetPixelCb(pixel,value) ((pixel)->green=(Quantum) (value))
+#define SetPixelCr(pixel,value) ((pixel)->blue=(Quantum) (value))
+#define SetPixelCyan(pixel,value) ((pixel)->red=(Quantum) (value))
+#define SetPixelGray(pixel,value) \
((pixel)->red=(pixel)->green=(pixel)->blue=(Quantum) (value))
-#define SetGreenPixelComponent(pixel,value) ((pixel)->green=(Quantum) (value))
-#define SetIndexPixelComponent(indexes,value) (*(indexes)=(IndexPacket) (value))
-#define SetMagentaPixelComponent(pixel,value) ((pixel)->green=(Quantum) (value))
-#define SetOpacityPixelComponent(pixel,value) \
+#define SetPixelGreen(pixel,value) ((pixel)->green=(Quantum) (value))
+#define SetPixelIndex(indexes,value) (*(indexes)=(IndexPacket) (value))
+#define SetPixelMagenta(pixel,value) ((pixel)->green=(Quantum) (value))
+#define SetPixelOpacity(pixel,value) \
((pixel)->opacity=(Quantum) (value))
-#define SetRedPixelComponent(pixel,value) ((pixel)->red=(Quantum) (value))
-#define SetRGBPixelComponents(pixel,packet) \
+#define SetPixelRed(pixel,value) ((pixel)->red=(Quantum) (value))
+#define SetPixelRGB(pixel,packet) \
{ \
- SetRedPixelComponent(pixel,(packet)->red); \
- SetGreenPixelComponent(pixel,(packet)->green); \
- SetBluePixelComponent(pixel,(packet)->blue); \
+ SetPixelRed(pixel,(packet)->red); \
+ SetPixelGreen(pixel,(packet)->green); \
+ SetPixelBlue(pixel,(packet)->blue); \
}
-#define SetRGBAPixelComponents(pixel,packet) \
+#define SetPixelRGBA(pixel,packet) \
{ \
- SetRedPixelComponent(pixel,(packet)->red); \
- SetGreenPixelComponent(pixel,(packet)->green); \
- SetBluePixelComponent(pixel,(packet)->blue); \
- SetAlphaPixelComponent(pixel,(QuantumRange-(packet)->opacity)); \
+ SetPixelRed(pixel,(packet)->red); \
+ SetPixelGreen(pixel,(packet)->green); \
+ SetPixelBlue(pixel,(packet)->blue); \
+ SetPixelAlpha(pixel,(QuantumRange-(packet)->opacity)); \
}
-#define SetRGBOPixelComponents(pixel,packet) \
+#define SetPixelRGBO(pixel,packet) \
{ \
- SetRedPixelComponent(pixel,(packet)->red); \
- SetGreenPixelComponent(pixel,(packet)->green); \
- SetBluePixelComponent(pixel,(packet)->blue); \
- SetOpacityPixelComponent(pixel,(packet)->opacity); \
+ SetPixelRed(pixel,(packet)->red); \
+ SetPixelGreen(pixel,(packet)->green); \
+ SetPixelBlue(pixel,(packet)->blue); \
+ SetPixelOpacity(pixel,(packet)->opacity); \
}
-#define SetYellowPixelComponent(pixel,value) ((pixel)->blue=(Quantum) (value))
-#define SetYPixelComponent(pixel,value) ((pixel)->red=(Quantum) (value))
+#define SetPixelYellow(pixel,value) ((pixel)->blue=(Quantum) (value))
+#define SetPixelY(pixel,value) ((pixel)->red=(Quantum) (value))
typedef enum
{
@@ -111,19 +111,19 @@
typedef enum
{
- RedPixelComponent = 0,
- CyanPixelComponent = 0,
- GrayPixelComponent = 0,
- YPixelComponent = 0,
- GreenPixelComponent = 1,
- MagentaPixelComponent = 1,
- CbPixelComponent = 1,
- BluePixelComponent = 2,
- YellowPixelComponent = 2,
- CrPixelComponent = 2,
- AlphaPixelComponent = 3,
- BlackPixelComponent = 4,
- IndexPixelComponent = 4,
+ PixelRed = 0,
+ PixelCyan = 0,
+ PixelGray = 0,
+ PixelY = 0,
+ PixelGreen = 1,
+ PixelMagenta = 1,
+ PixelCb = 1,
+ PixelBlue = 2,
+ PixelYellow = 2,
+ PixelCr = 2,
+ PixelAlpha = 3,
+ PixelBlack = 4,
+ PixelIndex = 4,
MaskPixelComponent = 5
} PixelComponent;
diff --git a/magick/prepress.c b/magick/prepress.c
index 21c0585..fbbcc8c 100644
--- a/magick/prepress.c
+++ b/magick/prepress.c
@@ -134,8 +134,8 @@
indexes=GetCacheViewVirtualIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- density=(double) GetRedPixelComponent(p)+GetGreenPixelComponent(p)+
- GetBluePixelComponent(p)+GetIndexPixelComponent(indexes+x);
+ density=(double) GetPixelRed(p)+GetPixelGreen(p)+
+ GetPixelBlue(p)+GetPixelIndex(indexes+x);
if (density > total_ink_density)
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_GetImageTotalInkDensity)
diff --git a/magick/profile.c b/magick/profile.c
index 669942a..d3a793f 100644
--- a/magick/profile.c
+++ b/magick/profile.c
@@ -1251,14 +1251,14 @@
p=source_pixels[id];
for (x=0; x < (ssize_t) image->columns; x++)
{
- *p++=ScaleQuantumToShort(GetRedPixelComponent(q));
+ *p++=ScaleQuantumToShort(GetPixelRed(q));
if (source_channels > 1)
{
- *p++=ScaleQuantumToShort(GetGreenPixelComponent(q));
- *p++=ScaleQuantumToShort(GetBluePixelComponent(q));
+ *p++=ScaleQuantumToShort(GetPixelGreen(q));
+ *p++=ScaleQuantumToShort(GetPixelBlue(q));
}
if (source_channels > 3)
- *p++=ScaleQuantumToShort(GetIndexPixelComponent(indexes+x));
+ *p++=ScaleQuantumToShort(GetPixelIndex(indexes+x));
q++;
}
cmsDoTransform(transform[id],source_pixels[id],target_pixels[id],
@@ -1267,20 +1267,20 @@
q-=image->columns;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRedPixelComponent(q,ScaleShortToQuantum(*p));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleShortToQuantum(*p));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p++;
if (target_channels > 1)
{
- SetGreenPixelComponent(q,ScaleShortToQuantum(*p));
+ SetPixelGreen(q,ScaleShortToQuantum(*p));
p++;
- SetBluePixelComponent(q,ScaleShortToQuantum(*p));
+ SetPixelBlue(q,ScaleShortToQuantum(*p));
p++;
}
if (target_channels > 3)
{
- SetIndexPixelComponent(indexes+x,ScaleShortToQuantum(*p));
+ SetPixelIndex(indexes+x,ScaleShortToQuantum(*p));
p++;
}
q++;
diff --git a/magick/quantize.c b/magick/quantize.c
index 9c976e7..22b6b46 100644
--- a/magick/quantize.c
+++ b/magick/quantize.c
@@ -435,18 +435,18 @@
if ((cube_info->associate_alpha == MagickFalse) ||
(pixel->opacity == OpaqueOpacity))
{
- alpha_pixel->red=(MagickRealType) GetRedPixelComponent(pixel);
- alpha_pixel->green=(MagickRealType) GetGreenPixelComponent(pixel);
- alpha_pixel->blue=(MagickRealType) GetBluePixelComponent(pixel);
- alpha_pixel->opacity=(MagickRealType) GetOpacityPixelComponent(pixel);
+ alpha_pixel->red=(MagickRealType) GetPixelRed(pixel);
+ alpha_pixel->green=(MagickRealType) GetPixelGreen(pixel);
+ alpha_pixel->blue=(MagickRealType) GetPixelBlue(pixel);
+ alpha_pixel->opacity=(MagickRealType) GetPixelOpacity(pixel);
return;
}
alpha=(MagickRealType) (QuantumScale*(QuantumRange-
- GetOpacityPixelComponent(pixel)));
- alpha_pixel->red=alpha*GetRedPixelComponent(pixel);
- alpha_pixel->green=alpha*GetGreenPixelComponent(pixel);
- alpha_pixel->blue=alpha*GetBluePixelComponent(pixel);
- alpha_pixel->opacity=(MagickRealType) GetOpacityPixelComponent(pixel);
+ GetPixelOpacity(pixel)));
+ alpha_pixel->red=alpha*GetPixelRed(pixel);
+ alpha_pixel->green=alpha*GetPixelGreen(pixel);
+ alpha_pixel->blue=alpha*GetPixelBlue(pixel);
+ alpha_pixel->opacity=(MagickRealType) GetPixelOpacity(pixel);
}
static inline Quantum ClampToUnsignedQuantum(const MagickRealType value)
@@ -465,26 +465,26 @@
id;
id=(size_t) (((ScaleQuantumToChar(ClampToUnsignedQuantum(
- GetRedPixelComponent(pixel))) >> index) & 0x01) |
+ GetPixelRed(pixel))) >> index) & 0x01) |
((ScaleQuantumToChar(ClampToUnsignedQuantum(
- GetGreenPixelComponent(pixel))) >> index) & 0x01) << 1 |
+ GetPixelGreen(pixel))) >> index) & 0x01) << 1 |
((ScaleQuantumToChar(ClampToUnsignedQuantum(
- GetBluePixelComponent(pixel))) >> index) & 0x01) << 2);
+ GetPixelBlue(pixel))) >> index) & 0x01) << 2);
if (cube_info->associate_alpha != MagickFalse)
id|=((ScaleQuantumToChar(ClampToUnsignedQuantum(
- GetOpacityPixelComponent(pixel))) >> index) & 0x1) << 3;
+ GetPixelOpacity(pixel))) >> index) & 0x1) << 3;
return(id);
}
static inline MagickBooleanType IsSameColor(const Image *image,
const PixelPacket *p,const PixelPacket *q)
{
- if ((GetRedPixelComponent(p) != GetRedPixelComponent(q)) ||
- (GetGreenPixelComponent(p) != GetGreenPixelComponent(q)) ||
- (GetBluePixelComponent(p) != GetBluePixelComponent(q)))
+ if ((GetPixelRed(p) != GetPixelRed(q)) ||
+ (GetPixelGreen(p) != GetPixelGreen(q)) ||
+ (GetPixelBlue(p) != GetPixelBlue(q)))
return(MagickFalse);
if ((image->matte != MagickFalse) &&
- (GetOpacityPixelComponent(p) != GetOpacityPixelComponent(q)))
+ (GetPixelOpacity(p) != GetPixelOpacity(q)))
return(MagickFalse);
return(MagickTrue);
}
@@ -607,12 +607,12 @@
for (i=0; i < (ssize_t) count; i++)
{
if (image->storage_class == PseudoClass)
- SetIndexPixelComponent(indexes+x+i,index);
+ SetPixelIndex(indexes+x+i,index);
if (cube.quantize_info->measure_error == MagickFalse)
{
- SetRGBPixelComponents(q,image->colormap+index);
+ SetPixelRGB(q,image->colormap+index);
if (cube.associate_alpha != MagickFalse)
- SetOpacityPixelComponent(q,image->colormap[index].opacity);
+ SetPixelOpacity(q,image->colormap[index].opacity);
}
q++;
}
@@ -657,9 +657,9 @@
{
intensity=(Quantum) (PixelIntensity(q) < ((MagickRealType)
QuantumRange/2.0) ? 0 : QuantumRange);
- SetRedPixelComponent(q,intensity);
- SetGreenPixelComponent(q,intensity);
- SetBluePixelComponent(q,intensity);
+ SetPixelRed(q,intensity);
+ SetPixelGreen(q,intensity);
+ SetPixelBlue(q,intensity);
q++;
}
}
@@ -1092,19 +1092,19 @@
beta=1.0;
if (cube_info->associate_alpha != MagickFalse)
{
- alpha=(MagickRealType) (QuantumScale*GetAlphaPixelComponent(p));
- beta=(MagickRealType) (QuantumScale*GetAlphaPixelComponent(q));
+ alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(p));
+ beta=(MagickRealType) (QuantumScale*GetPixelAlpha(q));
}
- pixel=alpha*GetRedPixelComponent(p)-beta*GetRedPixelComponent(q);
+ pixel=alpha*GetPixelRed(p)-beta*GetPixelRed(q);
distance=pixel*pixel;
if (distance <= cube_info->distance)
{
- pixel=alpha*GetGreenPixelComponent(p)-beta*GetGreenPixelComponent(q);
+ pixel=alpha*GetPixelGreen(p)-beta*GetPixelGreen(q);
distance+=pixel*pixel;
if (distance <= cube_info->distance)
{
- pixel=alpha*GetBluePixelComponent(p)-beta*
- GetBluePixelComponent(q);
+ pixel=alpha*GetPixelBlue(p)-beta*
+ GetPixelBlue(q);
distance+=pixel*pixel;
if (distance <= cube_info->distance)
{
@@ -1224,13 +1224,13 @@
alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha);
if (cube_info->associate_alpha == MagickFalse)
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+ SetPixelRed(q,ClampToQuantum((MagickRealType) (alpha*
QuantumRange*node_info->total_color.red)));
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+ SetPixelGreen(q,ClampToQuantum((MagickRealType) (alpha*
QuantumRange*node_info->total_color.green)));
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+ SetPixelBlue(q,ClampToQuantum((MagickRealType) (alpha*
QuantumRange*node_info->total_color.blue)));
- SetOpacityPixelComponent(q,OpaqueOpacity);
+ SetPixelOpacity(q,OpaqueOpacity);
}
else
{
@@ -1239,14 +1239,14 @@
opacity=(MagickRealType) (alpha*QuantumRange*
node_info->total_color.opacity);
- SetOpacityPixelComponent(q,ClampToQuantum(opacity));
+ SetPixelOpacity(q,ClampToQuantum(opacity));
if (q->opacity == OpaqueOpacity)
{
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+ SetPixelRed(q,ClampToQuantum((MagickRealType) (alpha*
QuantumRange*node_info->total_color.red)));
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+ SetPixelGreen(q,ClampToQuantum((MagickRealType) (alpha*
QuantumRange*node_info->total_color.green)));
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+ SetPixelBlue(q,ClampToQuantum((MagickRealType) (alpha*
QuantumRange*node_info->total_color.blue)));
}
else
@@ -1257,11 +1257,11 @@
gamma=(MagickRealType) (QuantumScale*(QuantumRange-
(MagickRealType) q->opacity));
gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+ SetPixelRed(q,ClampToQuantum((MagickRealType) (alpha*
gamma*QuantumRange*node_info->total_color.red)));
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType) (alpha*
+ SetPixelGreen(q,ClampToQuantum((MagickRealType) (alpha*
gamma*QuantumRange*node_info->total_color.green)));
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType) (
+ SetPixelBlue(q,ClampToQuantum((MagickRealType) (
alpha*gamma*QuantumRange*node_info->total_color.blue)));
if (node_info->number_unique > cube_info->transparent_pixels)
{
@@ -1595,12 +1595,12 @@
*/
index=(size_t) cube.cache[i];
if (image->storage_class == PseudoClass)
- SetIndexPixelComponent(indexes+u,index);
+ SetPixelIndex(indexes+u,index);
if (cube.quantize_info->measure_error == MagickFalse)
{
- SetRGBPixelComponents(q+u,image->colormap+index);
+ SetPixelRGB(q+u,image->colormap+index);
if (cube.associate_alpha != MagickFalse)
- SetOpacityPixelComponent(q+u,image->colormap[index].opacity);
+ SetPixelOpacity(q+u,image->colormap[index].opacity);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1819,9 +1819,9 @@
*indexes=(IndexPacket) index;
if (cube_info->quantize_info->measure_error == MagickFalse)
{
- SetRGBPixelComponents(q,image->colormap+index);
+ SetPixelRGB(q,image->colormap+index);
if (cube_info->associate_alpha != MagickFalse)
- SetOpacityPixelComponent(q,image->colormap[index].opacity);
+ SetPixelOpacity(q,image->colormap[index].opacity);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
return(MagickFalse);
@@ -2173,26 +2173,26 @@
indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- index=1UL*GetIndexPixelComponent(indexes+x);
+ index=1UL*GetPixelIndex(indexes+x);
if (image->matte != MagickFalse)
{
- alpha=(MagickRealType) (QuantumScale*(GetAlphaPixelComponent(p)));
+ alpha=(MagickRealType) (QuantumScale*(GetPixelAlpha(p)));
beta=(MagickRealType) (QuantumScale*(QuantumRange-
image->colormap[index].opacity));
}
- distance=fabs(alpha*GetRedPixelComponent(p)-beta*
+ distance=fabs(alpha*GetPixelRed(p)-beta*
image->colormap[index].red);
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
if (distance > maximum_error)
maximum_error=distance;
- distance=fabs(alpha*GetGreenPixelComponent(p)-beta*
+ distance=fabs(alpha*GetPixelGreen(p)-beta*
image->colormap[index].green);
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
if (distance > maximum_error)
maximum_error=distance;
- distance=fabs(alpha*GetBluePixelComponent(p)-beta*
+ distance=fabs(alpha*GetPixelBlue(p)-beta*
image->colormap[index].blue);
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
@@ -2381,18 +2381,18 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,PosterizePixel(GetRedPixelComponent(q)));
+ SetPixelRed(q,PosterizePixel(GetPixelRed(q)));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,PosterizePixel(GetGreenPixelComponent(q)));
+ SetPixelGreen(q,PosterizePixel(GetPixelGreen(q)));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,PosterizePixel(GetBluePixelComponent(q)));
+ SetPixelBlue(q,PosterizePixel(GetPixelBlue(q)));
if (((channel & OpacityChannel) != 0) &&
(image->matte == MagickTrue))
- SetOpacityPixelComponent(q,PosterizePixel(GetOpacityPixelComponent(q)));
+ SetPixelOpacity(q,PosterizePixel(GetPixelOpacity(q)));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(indexes+x,PosterizePixel(
- GetIndexPixelComponent(indexes+x)));
+ SetPixelIndex(indexes+x,PosterizePixel(
+ GetPixelIndex(indexes+x)));
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -3216,7 +3216,7 @@
register size_t
intensity;
- intensity=ScaleQuantumToMap(GetRedPixelComponent(q));
+ intensity=ScaleQuantumToMap(GetPixelRed(q));
if (colormap_index[intensity] < 0)
{
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -3225,14 +3225,14 @@
if (colormap_index[intensity] < 0)
{
colormap_index[intensity]=(ssize_t) image->colors;
- image->colormap[image->colors].red=GetRedPixelComponent(q);
+ image->colormap[image->colors].red=GetPixelRed(q);
image->colormap[image->colors].green=
- GetGreenPixelComponent(q);
- image->colormap[image->colors].blue=GetBluePixelComponent(q);
+ GetPixelGreen(q);
+ image->colormap[image->colors].blue=GetPixelBlue(q);
image->colors++;
}
}
- SetIndexPixelComponent(indexes+x,colormap_index[intensity]);
+ SetPixelIndex(indexes+x,colormap_index[intensity]);
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -3290,8 +3290,8 @@
}
indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
- SetIndexPixelComponent(indexes+x,colormap_index[ScaleQuantumToMap(
- GetIndexPixelComponent(indexes+x))]);
+ SetPixelIndex(indexes+x,colormap_index[ScaleQuantumToMap(
+ GetPixelIndex(indexes+x))]);
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
}
diff --git a/magick/quantum-export.c b/magick/quantum-export.c
index 4de2d8a..b872529 100644
--- a/magick/quantum-export.c
+++ b/magick/quantum-export.c
@@ -303,11 +303,10 @@
q=(PixelPacket *) GetCacheViewVirtualPixelQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- alpha=QuantumScale*GetAlphaPixelComponent(q);
- SetRedPixelComponent(q,ClampToQuantum(alpha*GetRedPixelComponent(q)));
- SetGreenPixelComponent(q,ClampToQuantum(alpha*
- GetGreenPixelComponent(q)));
- SetBluePixelComponent(q,ClampToQuantum(alpha*GetBluePixelComponent(q)));
+ alpha=QuantumScale*GetPixelAlpha(q);
+ SetPixelRed(q,ClampToQuantum(alpha*GetPixelRed(q)));
+ SetPixelGreen(q,ClampToQuantum(alpha*GetPixelGreen(q)));
+ SetPixelBlue(q,ClampToQuantum(alpha*GetPixelBlue(q)));
q++;
}
}
@@ -322,7 +321,7 @@
q=(PixelPacket *) GetCacheViewVirtualPixelQueue(image_view);
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q->opacity=(Quantum) GetAlphaPixelComponent(q);
+ q->opacity=(Quantum) GetPixelAlpha(q);
q++;
}
}
@@ -339,9 +338,9 @@
q=GetAuthenticPixelQueue(image);
for (x=0; x < (ssize_t) number_pixels; x++)
{
- quantum=GetRedPixelComponent(q);
- SetRedPixelComponent(q,GetGreenPixelComponent(q));
- SetGreenPixelComponent(q,quantum);
+ quantum=GetPixelRed(q);
+ SetPixelRed(q,GetPixelGreen(q));
+ SetPixelGreen(q,quantum);
q++;
}
}
@@ -424,7 +423,7 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopCharPixel((unsigned char) GetIndexPixelComponent(indexes+x),q);
+ q=PopCharPixel((unsigned char) GetPixelIndex(indexes+x),q);
q+=quantum_info->pad;
}
break;
@@ -436,14 +435,14 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopShortPixel(endian,SinglePrecisionToHalf(QuantumScale*
- GetIndexPixelComponent(indexes+x)),q);
+ GetPixelIndex(indexes+x)),q);
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopShortPixel(endian,(unsigned short) GetIndexPixelComponent(
+ q=PopShortPixel(endian,(unsigned short) GetPixelIndex(
indexes+x),q);
q+=quantum_info->pad;
}
@@ -455,7 +454,7 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetIndexPixelComponent(
+ q=PopFloatPixel(&quantum_state,(float) GetPixelIndex(
indexes+x),q);
p++;
q+=quantum_info->pad;
@@ -464,7 +463,7 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopLongPixel(endian,(unsigned int) GetIndexPixelComponent(
+ q=PopLongPixel(endian,(unsigned int) GetPixelIndex(
indexes+x),q);
q+=quantum_info->pad;
}
@@ -476,7 +475,7 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetIndexPixelComponent(
+ q=PopDoublePixel(&quantum_state,(double) GetPixelIndex(
indexes+x),q);
p++;
q+=quantum_info->pad;
@@ -489,7 +488,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- GetIndexPixelComponent(indexes+x),q);
+ GetPixelIndex(indexes+x),q);
p++;
q+=quantum_info->pad;
}
@@ -517,25 +516,25 @@
{
pixel=(unsigned char) *indexes++;
*q=((pixel & 0x01) << 7);
- pixel=(unsigned char) (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity ?
+ pixel=(unsigned char) (GetPixelOpacity(p) == (Quantum) TransparentOpacity ?
1 : 0);
*q|=((pixel & 0x01) << 6);
p++;
pixel=(unsigned char) *indexes++;
*q|=((pixel & 0x01) << 5);
- pixel=(unsigned char) (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity ?
+ pixel=(unsigned char) (GetPixelOpacity(p) == (Quantum) TransparentOpacity ?
1 : 0);
*q|=((pixel & 0x01) << 4);
p++;
pixel=(unsigned char) *indexes++;
*q|=((pixel & 0x01) << 3);
- pixel=(unsigned char) (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity ?
+ pixel=(unsigned char) (GetPixelOpacity(p) == (Quantum) TransparentOpacity ?
1 : 0);
*q|=((pixel & 0x01) << 2);
p++;
pixel=(unsigned char) *indexes++;
*q|=((pixel & 0x01) << 1);
- pixel=(unsigned char) (GetOpacityPixelComponent(p) == (Quantum) TransparentOpacity ?
+ pixel=(unsigned char) (GetPixelOpacity(p) == (Quantum) TransparentOpacity ?
1 : 0);
*q|=((pixel & 0x01) << 0);
p++;
@@ -548,7 +547,7 @@
{
pixel=(unsigned char) *indexes++;
*q|=((pixel & 0x01) << (unsigned char) (bit+4));
- pixel=(unsigned char) (GetOpacityPixelComponent(p) == (Quantum)
+ pixel=(unsigned char) (GetPixelOpacity(p) == (Quantum)
TransparentOpacity ? 1 : 0);
*q|=((pixel & 0x01) << (unsigned char) (bit+4-1));
p++;
@@ -567,7 +566,7 @@
pixel=(unsigned char) *indexes++;
*q=((pixel & 0xf) << 4);
pixel=(unsigned char) (16*QuantumScale*((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)))+0.5);
+ GetPixelOpacity(p)))+0.5);
*q|=((pixel & 0xf) << 0);
p++;
q++;
@@ -581,9 +580,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopCharPixel((unsigned char) GetIndexPixelComponent(indexes+x),q);
+ q=PopCharPixel((unsigned char) GetPixelIndex(indexes+x),q);
pixel=ScaleQuantumToChar((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
q=PopCharPixel(pixel,q);
p++;
q+=quantum_info->pad;
@@ -599,10 +598,10 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopShortPixel(endian,(unsigned short) GetIndexPixelComponent(
+ q=PopShortPixel(endian,(unsigned short) GetPixelIndex(
indexes+x),q);
pixel=SinglePrecisionToHalf(QuantumScale*
- GetAlphaPixelComponent(p));
+ GetPixelAlpha(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -611,10 +610,10 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopShortPixel(endian,(unsigned short) GetIndexPixelComponent(
+ q=PopShortPixel(endian,(unsigned short) GetPixelIndex(
indexes+x),q);
pixel=ScaleQuantumToShort((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -633,9 +632,9 @@
float
pixel;
- q=PopFloatPixel(&quantum_state,(float) GetIndexPixelComponent(
+ q=PopFloatPixel(&quantum_state,(float) GetPixelIndex(
indexes+x),q);
- pixel=(float) (GetAlphaPixelComponent(p));
+ pixel=(float) (GetPixelAlpha(p));
q=PopFloatPixel(&quantum_state,pixel,q);
p++;
q+=quantum_info->pad;
@@ -644,10 +643,10 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopLongPixel(endian,(unsigned int) GetIndexPixelComponent(
+ q=PopLongPixel(endian,(unsigned int) GetPixelIndex(
indexes+x),q);
pixel=ScaleQuantumToLong((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -663,9 +662,9 @@
double
pixel;
- q=PopDoublePixel(&quantum_state,(double) GetIndexPixelComponent(
+ q=PopDoublePixel(&quantum_state,(double) GetPixelIndex(
indexes+x),q);
- pixel=(double) (GetAlphaPixelComponent(p));
+ pixel=(double) (GetPixelAlpha(p));
q=PopDoublePixel(&quantum_state,pixel,q);
p++;
q+=quantum_info->pad;
@@ -679,9 +678,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- GetIndexPixelComponent(indexes+x),q);
+ GetPixelIndex(indexes+x),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny((Quantum) (GetAlphaPixelComponent(p)),range),q);
+ ScaleQuantumToAny((Quantum) (GetPixelAlpha(p)),range),q);
p++;
q+=quantum_info->pad;
}
@@ -698,9 +697,9 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopCharPixel(ScaleQuantumToChar(GetBluePixelComponent(p)),q);
- q=PopCharPixel(ScaleQuantumToChar(GetGreenPixelComponent(p)),q);
- q=PopCharPixel(ScaleQuantumToChar(GetRedPixelComponent(p)),q);
+ q=PopCharPixel(ScaleQuantumToChar(GetPixelBlue(p)),q);
+ q=PopCharPixel(ScaleQuantumToChar(GetPixelGreen(p)),q);
+ q=PopCharPixel(ScaleQuantumToChar(GetPixelRed(p)),q);
p++;
q+=quantum_info->pad;
}
@@ -716,9 +715,10 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) (ScaleQuantumToAny(GetRedPixelComponent(p),range) << 22 |
- ScaleQuantumToAny(GetGreenPixelComponent(p),range) << 12 |
- ScaleQuantumToAny(GetBluePixelComponent(p),range) << 2);
+ pixel=(unsigned int) (
+ ScaleQuantumToAny(GetPixelRed(p),range) << 22 |
+ ScaleQuantumToAny(GetPixelGreen(p),range) << 12 |
+ ScaleQuantumToAny(GetPixelBlue(p),range) << 2);
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -729,13 +729,13 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
p++;
@@ -745,11 +745,11 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
p++;
q+=quantum_info->pad;
@@ -771,17 +771,17 @@
default:
case 0:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
break;
}
case 1:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
break;
}
case 2:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
p++;
break;
}
@@ -792,17 +792,17 @@
default:
case 0:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
break;
}
case 1:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
break;
}
case 2:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
p++;
break;
}
@@ -817,17 +817,17 @@
default:
case 0:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
break;
}
case 1:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
break;
}
case 2:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
p++;
break;
}
@@ -843,13 +843,13 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
p++;
@@ -859,11 +859,11 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
p++;
q+=quantum_info->pad;
@@ -879,14 +879,11 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetBluePixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetGreenPixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetRedPixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -895,11 +892,11 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelBlue(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelGreen(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelRed(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -915,9 +912,9 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetRedPixelComponent(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetGreenPixelComponent(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetBluePixelComponent(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
p++;
q+=quantum_info->pad;
}
@@ -925,11 +922,11 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelBlue(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelGreen(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelRed(p));
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -942,9 +939,9 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetRedPixelComponent(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetGreenPixelComponent(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetBluePixelComponent(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
p++;
q+=quantum_info->pad;
}
@@ -957,11 +954,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetRedPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelRed(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetGreenPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelGreen(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetBluePixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelBlue(p),range),q);
p++;
q+=quantum_info->pad;
}
@@ -982,13 +979,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelBlue(p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelGreen(p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelRed(p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar((Quantum) GetAlphaPixelComponent(p));
+ pixel=ScaleQuantumToChar((Quantum) GetPixelAlpha(p));
q=PopCharPixel(pixel,q);
p++;
q+=quantum_info->pad;
@@ -1021,10 +1018,10 @@
{
switch (i)
{
- case 0: quantum=GetRedPixelComponent(p); break;
- case 1: quantum=GetGreenPixelComponent(p); break;
- case 2: quantum=GetBluePixelComponent(p); break;
- case 3: quantum=(Quantum) (QuantumRange-GetOpacityPixelComponent(p)); break;
+ case 0: quantum=GetPixelRed(p); break;
+ case 1: quantum=GetPixelGreen(p); break;
+ case 2: quantum=GetPixelBlue(p); break;
+ case 3: quantum=(Quantum) (QuantumRange-GetPixelOpacity(p)); break;
}
switch (n % 3)
{
@@ -1060,17 +1057,17 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
pixel=(unsigned int) ScaleQuantumToAny((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)),range);
+ GetPixelOpacity(p)),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
p++;
@@ -1080,14 +1077,14 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
pixel=(unsigned int) ScaleQuantumToAny((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)),range);
+ GetPixelOpacity(p)),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1103,17 +1100,13 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetBluePixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetGreenPixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetRedPixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetAlphaPixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelAlpha(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1122,13 +1115,13 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelBlue(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelGreen(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelRed(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort((Quantum) GetAlphaPixelComponent(p));
+ pixel=ScaleQuantumToShort((Quantum) GetPixelAlpha(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1147,10 +1140,10 @@
float
pixel;
- q=PopFloatPixel(&quantum_state,(float) GetRedPixelComponent(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetGreenPixelComponent(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetBluePixelComponent(p),q);
- pixel=(float) GetAlphaPixelComponent(p);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
+ pixel=(float) GetPixelAlpha(p);
q=PopFloatPixel(&quantum_state,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1159,13 +1152,13 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelBlue(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelGreen(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelRed(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong((Quantum) GetAlphaPixelComponent(p));
+ pixel=ScaleQuantumToLong((Quantum) GetPixelAlpha(p));
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1181,10 +1174,10 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetRedPixelComponent(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetGreenPixelComponent(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetBluePixelComponent(p),q);
- pixel=(double) GetAlphaPixelComponent(p);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
+ pixel=(double) GetPixelAlpha(p);
q=PopDoublePixel(&quantum_state,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1198,13 +1191,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetBluePixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelBlue(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetGreenPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelGreen(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetRedPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelRed(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny((Quantum) GetAlphaPixelComponent(p),range),q);
+ ScaleQuantumToAny((Quantum) GetPixelAlpha(p),range),q);
p++;
q+=quantum_info->pad;
}
@@ -1481,19 +1474,19 @@
{
*q='\0';
*q|=(PixelIntensityToQuantum(p) > threshold ? black : white) << 7;
- pixel=(unsigned char) (GetOpacityPixelComponent(p) == OpaqueOpacity ? 0x00 : 0x01);
+ pixel=(unsigned char) (GetPixelOpacity(p) == OpaqueOpacity ? 0x00 : 0x01);
*q|=(((int) pixel != 0 ? 0x00 : 0x01) << 6);
p++;
*q|=(PixelIntensityToQuantum(p) > threshold ? black : white) << 5;
- pixel=(unsigned char) (GetOpacityPixelComponent(p) == OpaqueOpacity ? 0x00 : 0x01);
+ pixel=(unsigned char) (GetPixelOpacity(p) == OpaqueOpacity ? 0x00 : 0x01);
*q|=(((int) pixel != 0 ? 0x00 : 0x01) << 4);
p++;
*q|=(PixelIntensityToQuantum(p) > threshold ? black : white) << 3;
- pixel=(unsigned char) (GetOpacityPixelComponent(p) == OpaqueOpacity ? 0x00 : 0x01);
+ pixel=(unsigned char) (GetPixelOpacity(p) == OpaqueOpacity ? 0x00 : 0x01);
*q|=(((int) pixel != 0 ? 0x00 : 0x01) << 2);
p++;
*q|=(PixelIntensityToQuantum(p) > threshold ? black : white) << 1;
- pixel=(unsigned char) (GetOpacityPixelComponent(p) == OpaqueOpacity ? 0x00 : 0x01);
+ pixel=(unsigned char) (GetPixelOpacity(p) == OpaqueOpacity ? 0x00 : 0x01);
*q|=(((int) pixel != 0 ? 0x00 : 0x01) << 0);
p++;
q++;
@@ -1505,7 +1498,7 @@
{
*q|=(PixelIntensityToQuantum(p) > threshold ? black : white) <<
(7-bit);
- pixel=(unsigned char) (GetOpacityPixelComponent(p) == OpaqueOpacity ? 0x00 :
+ pixel=(unsigned char) (GetPixelOpacity(p) == OpaqueOpacity ? 0x00 :
0x01);
*q|=(((int) pixel != 0 ? 0x00 : 0x01) << (unsigned char)
(7-bit-1));
@@ -1525,7 +1518,7 @@
pixel=ScaleQuantumToChar(PixelIntensityToQuantum(p));
*q=(((pixel >> 4) & 0xf) << 4);
pixel=(unsigned char) (16*QuantumScale*((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)))+0.5);
+ GetPixelOpacity(p)))+0.5);
*q|=pixel & 0xf;
p++;
q++;
@@ -1542,7 +1535,7 @@
pixel=ScaleQuantumToChar(PixelIntensityToQuantum(p));
q=PopCharPixel(pixel,q);
pixel=ScaleQuantumToChar((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
q=PopCharPixel(pixel,q);
p++;
q+=quantum_info->pad;
@@ -1562,7 +1555,7 @@
PixelIntensityToQuantum(p));
q=PopShortPixel(endian,pixel,q);
pixel=SinglePrecisionToHalf(QuantumScale*
- GetAlphaPixelComponent(p));
+ GetPixelAlpha(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1574,7 +1567,7 @@
pixel=ScaleQuantumToShort(PixelIntensityToQuantum(p));
q=PopShortPixel(endian,pixel,q);
pixel=ScaleQuantumToShort((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1595,7 +1588,7 @@
pixel=(float) PixelIntensityToQuantum(p);
q=PopFloatPixel(&quantum_state,pixel,q);
- pixel=(float) (GetAlphaPixelComponent(p));
+ pixel=(float) (GetPixelAlpha(p));
q=PopFloatPixel(&quantum_state,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1607,7 +1600,7 @@
pixel=ScaleQuantumToLong(PixelIntensityToQuantum(p));
q=PopLongPixel(endian,pixel,q);
pixel=ScaleQuantumToLong((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1625,7 +1618,7 @@
pixel=(double) PixelIntensityToQuantum(p);
q=PopDoublePixel(&quantum_state,pixel,q);
- pixel=(double) (GetAlphaPixelComponent(p));
+ pixel=(double) (GetPixelAlpha(p));
q=PopDoublePixel(&quantum_state,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1641,7 +1634,7 @@
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
ScaleQuantumToAny(PixelIntensityToQuantum(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny((Quantum) (GetAlphaPixelComponent(p)),range),q);
+ ScaleQuantumToAny((Quantum) (GetPixelAlpha(p)),range),q);
p++;
q+=quantum_info->pad;
}
@@ -1662,7 +1655,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelRed(p));
q=PopCharPixel(pixel,q);
p++;
q+=quantum_info->pad;
@@ -1678,8 +1671,7 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetRedPixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1688,7 +1680,7 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelRed(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1704,7 +1696,7 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetRedPixelComponent(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
p++;
q+=quantum_info->pad;
}
@@ -1712,7 +1704,7 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelRed(p));
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1725,7 +1717,7 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetRedPixelComponent(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
p++;
q+=quantum_info->pad;
}
@@ -1738,7 +1730,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetRedPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelRed(p),range),q);
p++;
q+=quantum_info->pad;
}
@@ -1759,7 +1751,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelGreen(p));
q=PopCharPixel(pixel,q);
p++;
q+=quantum_info->pad;
@@ -1776,7 +1768,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=SinglePrecisionToHalf(QuantumScale*
- GetGreenPixelComponent(p));
+ GetPixelGreen(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1785,7 +1777,7 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelGreen(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1801,7 +1793,7 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetGreenPixelComponent(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
p++;
q+=quantum_info->pad;
}
@@ -1809,7 +1801,7 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelGreen(p));
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1822,7 +1814,7 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetGreenPixelComponent(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
p++;
q+=quantum_info->pad;
}
@@ -1835,7 +1827,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetGreenPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelGreen(p),range),q);
p++;
q+=quantum_info->pad;
}
@@ -1856,7 +1848,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelBlue(p));
q=PopCharPixel(pixel,q);
p++;
q+=quantum_info->pad;
@@ -1873,7 +1865,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=SinglePrecisionToHalf(QuantumScale*
- GetBluePixelComponent(p));
+ GetPixelBlue(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1882,7 +1874,7 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelBlue(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1898,7 +1890,7 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetBluePixelComponent(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
p++;
q+=quantum_info->pad;
}
@@ -1906,7 +1898,7 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelBlue(p));
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1919,7 +1911,7 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetBluePixelComponent(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
p++;
q+=quantum_info->pad;
}
@@ -1932,7 +1924,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetBluePixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelBlue(p),range),q);
p++;
q+=quantum_info->pad;
}
@@ -1953,7 +1945,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=ScaleQuantumToChar((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
q=PopCharPixel(pixel,q);
p++;
q+=quantum_info->pad;
@@ -1970,7 +1962,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=SinglePrecisionToHalf(QuantumScale*
- GetAlphaPixelComponent(p));
+ GetPixelAlpha(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1980,7 +1972,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=ScaleQuantumToShort((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -1999,7 +1991,7 @@
float
pixel;
- pixel=(float) (GetAlphaPixelComponent(p));
+ pixel=(float) (GetPixelAlpha(p));
q=PopFloatPixel(&quantum_state,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2009,7 +2001,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=ScaleQuantumToLong((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2025,7 +2017,7 @@
double
pixel;
- pixel=(double) (GetAlphaPixelComponent(p));
+ pixel=(double) (GetPixelAlpha(p));
q=PopDoublePixel(&quantum_state,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2039,7 +2031,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny((Quantum) (GetAlphaPixelComponent(p)),range),q);
+ ScaleQuantumToAny((Quantum) (GetPixelAlpha(p)),range),q);
p++;
q+=quantum_info->pad;
}
@@ -2059,7 +2051,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetOpacityPixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelOpacity(p));
q=PopCharPixel(pixel,q);
p++;
q+=quantum_info->pad;
@@ -2076,7 +2068,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=SinglePrecisionToHalf(QuantumScale*
- GetOpacityPixelComponent(p));
+ GetPixelOpacity(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2085,7 +2077,7 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetOpacityPixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelOpacity(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2101,7 +2093,7 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetOpacityPixelComponent(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelOpacity(p),q);
p++;
q+=quantum_info->pad;
}
@@ -2109,7 +2101,7 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetOpacityPixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelOpacity(p));
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2122,7 +2114,7 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetOpacityPixelComponent(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelOpacity(p),q);
p++;
q+=quantum_info->pad;
}
@@ -2135,7 +2127,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetOpacityPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelOpacity(p),range),q);
p++;
q+=quantum_info->pad;
}
@@ -2161,7 +2153,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetIndexPixelComponent(indexes+x));
+ pixel=ScaleQuantumToChar(GetPixelIndex(indexes+x));
q=PopCharPixel(pixel,q);
p++;
q+=quantum_info->pad;
@@ -2177,7 +2169,7 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*GetIndexPixelComponent(
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelIndex(
indexes+x));
q=PopShortPixel(endian,pixel,q);
p++;
@@ -2187,7 +2179,7 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetIndexPixelComponent(indexes+x));
+ pixel=ScaleQuantumToShort(GetPixelIndex(indexes+x));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2203,7 +2195,7 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetIndexPixelComponent(
+ q=PopFloatPixel(&quantum_state,(float) GetPixelIndex(
indexes+x),q);
p++;
q+=quantum_info->pad;
@@ -2212,7 +2204,7 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetIndexPixelComponent(indexes+x));
+ pixel=ScaleQuantumToLong(GetPixelIndex(indexes+x));
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2225,7 +2217,7 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetIndexPixelComponent(
+ q=PopDoublePixel(&quantum_state,(double) GetPixelIndex(
indexes+x),q);
p++;
q+=quantum_info->pad;
@@ -2239,7 +2231,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny((Quantum) GetIndexPixelComponent(indexes+x),
+ ScaleQuantumToAny((Quantum) GetPixelIndex(indexes+x),
range),q);
p++;
q+=quantum_info->pad;
@@ -2258,9 +2250,9 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopCharPixel(ScaleQuantumToChar(GetRedPixelComponent(p)),q);
- q=PopCharPixel(ScaleQuantumToChar(GetGreenPixelComponent(p)),q);
- q=PopCharPixel(ScaleQuantumToChar(GetBluePixelComponent(p)),q);
+ q=PopCharPixel(ScaleQuantumToChar(GetPixelRed(p)),q);
+ q=PopCharPixel(ScaleQuantumToChar(GetPixelGreen(p)),q);
+ q=PopCharPixel(ScaleQuantumToChar(GetPixelBlue(p)),q);
p++;
q+=quantum_info->pad;
}
@@ -2276,9 +2268,9 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) (ScaleQuantumToAny(GetRedPixelComponent(p),range) << 22 |
- ScaleQuantumToAny(GetGreenPixelComponent(p),range) << 12 |
- ScaleQuantumToAny(GetBluePixelComponent(p),range) << 2);
+ pixel=(unsigned int) (ScaleQuantumToAny(GetPixelRed(p),range) << 22 |
+ ScaleQuantumToAny(GetPixelGreen(p),range) << 12 |
+ ScaleQuantumToAny(GetPixelBlue(p),range) << 2);
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2289,13 +2281,13 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
p++;
@@ -2305,11 +2297,11 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2331,17 +2323,17 @@
default:
case 0:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
break;
}
case 1:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
break;
}
case 2:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
p++;
break;
}
@@ -2352,17 +2344,17 @@
default:
case 0:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
break;
}
case 1:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
break;
}
case 2:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
p++;
break;
}
@@ -2377,17 +2369,17 @@
default:
case 0:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
break;
}
case 1:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
break;
}
case 2:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
p++;
break;
}
@@ -2403,13 +2395,13 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
p++;
@@ -2419,11 +2411,11 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2439,14 +2431,11 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetRedPixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetGreenPixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetBluePixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2455,11 +2444,11 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelRed(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelGreen(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelBlue(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2475,9 +2464,9 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetRedPixelComponent(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetGreenPixelComponent(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetBluePixelComponent(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
p++;
q+=quantum_info->pad;
}
@@ -2485,11 +2474,11 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelRed(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelGreen(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelBlue(p));
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2502,9 +2491,9 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetRedPixelComponent(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetGreenPixelComponent(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetBluePixelComponent(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
p++;
q+=quantum_info->pad;
}
@@ -2517,11 +2506,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetRedPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelRed(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetGreenPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelGreen(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetBluePixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelBlue(p),range),q);
p++;
q+=quantum_info->pad;
}
@@ -2543,13 +2532,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelRed(p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelGreen(p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelBlue(p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar((Quantum) GetAlphaPixelComponent(p));
+ pixel=ScaleQuantumToChar((Quantum) GetPixelAlpha(p));
q=PopCharPixel(pixel,q);
p++;
q+=quantum_info->pad;
@@ -2582,10 +2571,10 @@
{
switch (i)
{
- case 0: quantum=GetRedPixelComponent(p); break;
- case 1: quantum=GetGreenPixelComponent(p); break;
- case 2: quantum=GetBluePixelComponent(p); break;
- case 3: quantum=(Quantum) (QuantumRange-GetOpacityPixelComponent(p)); break;
+ case 0: quantum=GetPixelRed(p); break;
+ case 1: quantum=GetPixelGreen(p); break;
+ case 2: quantum=GetPixelBlue(p); break;
+ case 3: quantum=(Quantum) (QuantumRange-GetPixelOpacity(p)); break;
}
switch (n % 3)
{
@@ -2621,17 +2610,17 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
pixel=(unsigned int) ScaleQuantumToAny((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)),range);
+ GetPixelOpacity(p)),range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
p++;
@@ -2641,14 +2630,14 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetRedPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetGreenPixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetBluePixelComponent(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
pixel=(unsigned int) ScaleQuantumToAny((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)),range);
+ GetPixelOpacity(p)),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2664,17 +2653,13 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetRedPixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetGreenPixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetBluePixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetAlphaPixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelAlpha(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2683,13 +2668,13 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelRed(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelGreen(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelBlue(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort((Quantum) GetAlphaPixelComponent(p));
+ pixel=ScaleQuantumToShort((Quantum) GetPixelAlpha(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2708,10 +2693,10 @@
float
pixel;
- q=PopFloatPixel(&quantum_state,(float) GetRedPixelComponent(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetGreenPixelComponent(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetBluePixelComponent(p),q);
- pixel=(float) GetAlphaPixelComponent(p);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
+ pixel=(float) GetPixelAlpha(p);
q=PopFloatPixel(&quantum_state,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2720,13 +2705,13 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelRed(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelGreen(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelBlue(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong((Quantum) GetAlphaPixelComponent(p));
+ pixel=ScaleQuantumToLong((Quantum) GetPixelAlpha(p));
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2742,10 +2727,10 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetRedPixelComponent(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetGreenPixelComponent(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetBluePixelComponent(p),q);
- pixel=(double) GetAlphaPixelComponent(p);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
+ pixel=(double) GetPixelAlpha(p);
q=PopDoublePixel(&quantum_state,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2759,13 +2744,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetRedPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelRed(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetGreenPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelGreen(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetBluePixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelBlue(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny((Quantum) GetAlphaPixelComponent(p),range),q);
+ ScaleQuantumToAny((Quantum) GetPixelAlpha(p),range),q);
p++;
q+=quantum_info->pad;
}
@@ -2791,13 +2776,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelRed(p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelGreen(p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelBlue(p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetIndexPixelComponent(indexes+x));
+ pixel=ScaleQuantumToChar(GetPixelIndex(indexes+x));
q=PopCharPixel(pixel,q);
p++;
q+=quantum_info->pad;
@@ -2813,16 +2798,13 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetRedPixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetGreenPixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetBluePixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetIndexPixelComponent(
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelIndex(
indexes+x));
q=PopShortPixel(endian,pixel,q);
p++;
@@ -2832,13 +2814,13 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelRed(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelGreen(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelBlue(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetIndexPixelComponent(indexes+x));
+ pixel=ScaleQuantumToShort(GetPixelIndex(indexes+x));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2854,14 +2836,11 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
+ q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
q=PopFloatPixel(&quantum_state,(float)
- GetRedPixelComponent(p),q);
- q=PopFloatPixel(&quantum_state,(float)
- GetGreenPixelComponent(p),q);
- q=PopFloatPixel(&quantum_state,(float)
- GetBluePixelComponent(p),q);
- q=PopFloatPixel(&quantum_state,(float)
- GetIndexPixelComponent(indexes+x),q);
+ GetPixelIndex(indexes+x),q);
p++;
q+=quantum_info->pad;
}
@@ -2869,13 +2848,13 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelRed(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelGreen(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelBlue(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetIndexPixelComponent(indexes+x));
+ pixel=ScaleQuantumToLong(GetPixelIndex(indexes+x));
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2888,14 +2867,11 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
+ q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
q=PopDoublePixel(&quantum_state,(double)
- GetRedPixelComponent(p),q);
- q=PopDoublePixel(&quantum_state,(double)
- GetGreenPixelComponent(p),q);
- q=PopDoublePixel(&quantum_state,(double)
- GetBluePixelComponent(p),q);
- q=PopDoublePixel(&quantum_state,(double)
- GetIndexPixelComponent(indexes+x),q);
+ GetPixelIndex(indexes+x),q);
p++;
q+=quantum_info->pad;
}
@@ -2908,13 +2884,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetRedPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelRed(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetGreenPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelGreen(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetBluePixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelBlue(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetIndexPixelComponent(indexes+x),range),q);
+ ScaleQuantumToAny(GetPixelIndex(indexes+x),range),q);
p++;
q+=quantum_info->pad;
}
@@ -2941,16 +2917,16 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelRed(p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelGreen(p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToChar(GetPixelBlue(p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetIndexPixelComponent(indexes+x));
+ pixel=ScaleQuantumToChar(GetPixelIndex(indexes+x));
q=PopCharPixel(pixel,q);
pixel=ScaleQuantumToChar((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
q=PopCharPixel(pixel,q);
p++;
q+=quantum_info->pad;
@@ -2966,20 +2942,16 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetRedPixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
+ q=PopShortPixel(endian,pixel,q);
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
+ q=PopShortPixel(endian,pixel,q);
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
q=PopShortPixel(endian,pixel,q);
pixel=SinglePrecisionToHalf(QuantumScale*
- GetGreenPixelComponent(p));
+ GetPixelIndex(indexes+x));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetBluePixelComponent(p));
- q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetIndexPixelComponent(indexes+x));
- q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*
- GetAlphaPixelComponent(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*GetPixelAlpha(p));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -2988,16 +2960,16 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelRed(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelGreen(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToShort(GetPixelBlue(p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetIndexPixelComponent(indexes+x));
+ pixel=ScaleQuantumToShort(GetPixelIndex(indexes+x));
q=PopShortPixel(endian,pixel,q);
pixel=ScaleQuantumToShort((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
q=PopShortPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -3016,15 +2988,12 @@
float
pixel;
+ q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
+ q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
q=PopFloatPixel(&quantum_state,(float)
- GetRedPixelComponent(p),q);
- q=PopFloatPixel(&quantum_state,(float)
- GetGreenPixelComponent(p),q);
- q=PopFloatPixel(&quantum_state,(float)
- GetBluePixelComponent(p),q);
- q=PopFloatPixel(&quantum_state,(float)
- GetIndexPixelComponent(indexes+x),q);
- pixel=(float) (GetAlphaPixelComponent(p));
+ GetPixelIndex(indexes+x),q);
+ pixel=(float) (GetPixelAlpha(p));
q=PopFloatPixel(&quantum_state,pixel,q);
p++;
q+=quantum_info->pad;
@@ -3033,16 +3002,16 @@
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetRedPixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelRed(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetGreenPixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelGreen(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetBluePixelComponent(p));
+ pixel=ScaleQuantumToLong(GetPixelBlue(p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetIndexPixelComponent(indexes+x));
+ pixel=ScaleQuantumToLong(GetPixelIndex(indexes+x));
q=PopLongPixel(endian,pixel,q);
pixel=ScaleQuantumToLong((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
q=PopLongPixel(endian,pixel,q);
p++;
q+=quantum_info->pad;
@@ -3058,15 +3027,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
+ q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
+ q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
q=PopDoublePixel(&quantum_state,(double)
- GetRedPixelComponent(p),q);
- q=PopDoublePixel(&quantum_state,(double)
- GetGreenPixelComponent(p),q);
- q=PopDoublePixel(&quantum_state,(double)
- GetBluePixelComponent(p),q);
- q=PopDoublePixel(&quantum_state,(double)
- GetIndexPixelComponent(indexes+x),q);
- pixel=(double) (GetAlphaPixelComponent(p));
+ GetPixelIndex(indexes+x),q);
+ pixel=(double) (GetPixelAlpha(p));
q=PopDoublePixel(&quantum_state,pixel,q);
p++;
q+=quantum_info->pad;
@@ -3080,15 +3046,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetRedPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelRed(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetGreenPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelGreen(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetBluePixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelBlue(p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetIndexPixelComponent(indexes+x),range),q);
+ ScaleQuantumToAny(GetPixelIndex(indexes+x),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetOpacityPixelComponent(p),range),q);
+ ScaleQuantumToAny(GetPixelOpacity(p),range),q);
p++;
q+=quantum_info->pad;
}
@@ -3131,17 +3097,17 @@
{
case 0:
{
- quantum=GetRedPixelComponent(p);
+ quantum=GetPixelRed(p);
break;
}
case 1:
{
- quantum=GetGreenPixelComponent(p);
+ quantum=GetPixelGreen(p);
break;
}
case 2:
{
- quantum=GetBluePixelComponent(p);
+ quantum=GetPixelBlue(p);
break;
}
}
@@ -3174,17 +3140,17 @@
{
case 0:
{
- quantum=GetRedPixelComponent(p);
+ quantum=GetPixelRed(p);
break;
}
case 1:
{
- quantum=GetGreenPixelComponent(p);
+ quantum=GetPixelGreen(p);
break;
}
case 2:
{
- quantum=GetBluePixelComponent(p);
+ quantum=GetPixelBlue(p);
break;
}
}
@@ -3228,9 +3194,9 @@
q=(PixelPacket *) GetCacheViewVirtualPixelQueue(image_view);
for (x=0; x < (ssize_t) number_pixels; x++)
{
- quantum=GetRedPixelComponent(q);
- SetRedPixelComponent(q,GetGreenPixelComponent(q));
- SetGreenPixelComponent(q,quantum);
+ quantum=GetPixelRed(q);
+ SetPixelRed(q,GetPixelGreen(q));
+ SetPixelGreen(q,quantum);
q++;
}
}
@@ -3245,7 +3211,7 @@
q=(PixelPacket *) GetCacheViewVirtualPixelQueue(image_view);
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q->opacity=(Quantum) GetAlphaPixelComponent(q);
+ SetPixelOpacity(q,(Quantum) GetPixelAlpha(q));
q++;
}
}
diff --git a/magick/quantum-import.c b/magick/quantum-import.c
index 80602b0..cd80cb3 100644
--- a/magick/quantum-import.c
+++ b/magick/quantum-import.c
@@ -344,10 +344,10 @@
else
pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ?
0x00 : 0x01);
- SetIndexPixelComponent(indexes+x+bit,PushColormapIndex(image,
+ SetPixelIndex(indexes+x+bit,PushColormapIndex(image,
pixel,&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x+bit));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x+bit));
q++;
}
p++;
@@ -360,10 +360,10 @@
else
pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ?
0x00 : 0x01);
- SetIndexPixelComponent(indexes+x+bit,PushColormapIndex(image,pixel,
+ SetPixelIndex(indexes+x+bit,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x+bit));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x+bit));
q++;
}
break;
@@ -376,26 +376,26 @@
for (x=0; x < ((ssize_t) number_pixels-1); x+=2)
{
pixel=(unsigned char) ((*p >> 4) & 0xf);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
q++;
pixel=(unsigned char) ((*p) & 0xf);
- SetIndexPixelComponent(indexes+x+1,PushColormapIndex(image,pixel,
+ SetPixelIndex(indexes+x+1,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x+1));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x+1));
p++;
q++;
}
for (bit=0; bit < (ssize_t) (number_pixels % 2); bit++)
{
pixel=(unsigned char) ((*p++ >> 4) & 0xf);
- SetIndexPixelComponent(indexes+x+bit,PushColormapIndex(image,pixel,
+ SetPixelIndex(indexes+x+bit,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x+bit));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x+bit));
q++;
}
break;
@@ -408,10 +408,10 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
p+=quantum_info->pad;
q++;
}
@@ -427,11 +427,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,
ClampToQuantum((MagickRealType) QuantumRange*
HalfToSinglePrecision(pixel)),&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
p+=quantum_info->pad;
q++;
}
@@ -440,10 +440,10 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
p+=quantum_info->pad;
q++;
}
@@ -462,10 +462,10 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,
ClampToQuantum(pixel),&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
p+=quantum_info->pad;
q++;
}
@@ -474,10 +474,10 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
p+=quantum_info->pad;
q++;
}
@@ -493,10 +493,10 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,
ClampToQuantum(pixel),&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
p+=quantum_info->pad;
q++;
}
@@ -508,10 +508,10 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
p+=quantum_info->pad;
q++;
}
@@ -552,11 +552,11 @@
else
pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ?
0x00 : 0x01);
- SetIndexPixelComponent(indexes+x+bit/2,pixel == 0 ? 0 : 1);
- SetRedPixelComponent(q,pixel == 0 ? 0 : QuantumRange);
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
- SetOpacityPixelComponent(q,((*p) & (1UL << (unsigned char)
+ SetPixelIndex(indexes+x+bit/2,pixel == 0 ? 0 : 1);
+ SetPixelRed(q,pixel == 0 ? 0 : QuantumRange);
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
+ SetPixelOpacity(q,((*p) & (1UL << (unsigned char)
(6-bit))) == 0 ? TransparentOpacity : OpaqueOpacity);
q++;
}
@@ -569,11 +569,11 @@
else
pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ?
0x00 : 0x01);
- SetIndexPixelComponent(indexes+x+bit/2,pixel == 0 ? 0 : 1);
- SetRedPixelComponent(q,pixel == 0 ? 0 : QuantumRange);
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
- SetOpacityPixelComponent(q,((*p) & (1UL << (unsigned char)
+ SetPixelIndex(indexes+x+bit/2,pixel == 0 ? 0 : 1);
+ SetPixelRed(q,pixel == 0 ? 0 : QuantumRange);
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
+ SetPixelOpacity(q,((*p) & (1UL << (unsigned char)
(6-bit))) == 0 ? TransparentOpacity : OpaqueOpacity);
q++;
}
@@ -588,12 +588,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=(unsigned char) ((*p >> 4) & 0xf);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
pixel=(unsigned char) ((*p) & 0xf);
- SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
p++;
q++;
}
@@ -607,12 +607,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
p=PushCharPixel(p,&pixel);
- SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelAlpha(q,ScaleCharToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -628,13 +628,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,
ClampToQuantum((MagickRealType) QuantumRange*
HalfToSinglePrecision(pixel)),&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
p=PushShortPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelAlpha(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p+=quantum_info->pad;
q++;
@@ -644,12 +644,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
p=PushShortPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelAlpha(q,ScaleShortToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -668,12 +668,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,
ClampToQuantum(pixel),&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelAlpha(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -682,12 +682,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
p=PushLongPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelAlpha(q,ScaleLongToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -703,12 +703,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,
ClampToQuantum(pixel),&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelAlpha(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -721,12 +721,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetIndexPixelComponent(indexes+x,PushColormapIndex(image,pixel,
+ SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
&range_exception));
- SetRGBOPixelComponents(q,image->colormap+(ssize_t)
- GetIndexPixelComponent(indexes+x));
+ SetPixelRGBO(q,image->colormap+(ssize_t)
+ GetPixelIndex(indexes+x));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
p+=quantum_info->pad;
q++;
}
@@ -750,12 +750,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetBluePixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelBlue(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetGreenPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelGreen(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
- SetOpacityPixelComponent(q,OpaqueOpacity);
+ SetPixelRed(q,ScaleCharToQuantum(pixel));
+ SetPixelOpacity(q,OpaqueOpacity);
p+=quantum_info->pad;
q++;
}
@@ -769,11 +769,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 22) & 0x3ff,
+ SetPixelRed(q,ScaleAnyToQuantum((pixel >> 22) & 0x3ff,
range));
- SetGreenPixelComponent(q,ScaleAnyToQuantum((pixel >> 12) &
+ SetPixelGreen(q,ScaleAnyToQuantum((pixel >> 12) &
0x3ff,range));
- SetBluePixelComponent(q,ScaleAnyToQuantum((pixel >> 2) & 0x3ff,
+ SetPixelBlue(q,ScaleAnyToQuantum((pixel >> 2) & 0x3ff,
range));
p+=quantum_info->pad;
q++;
@@ -785,11 +785,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
q++;
}
break;
@@ -797,11 +797,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
q++;
}
break;
@@ -822,19 +822,19 @@
default:
case 0:
{
- SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
break;
}
case 1:
{
- SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
break;
}
case 2:
{
- SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
q++;
break;
@@ -846,19 +846,19 @@
default:
case 0:
{
- SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
break;
}
case 1:
{
- SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
break;
}
case 2:
{
- SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
q++;
break;
@@ -874,19 +874,19 @@
default:
case 0:
{
- SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
break;
}
case 1:
{
- SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
break;
}
case 2:
{
- SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
q++;
break;
@@ -903,11 +903,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
q++;
}
break;
@@ -915,11 +915,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
q++;
}
break;
@@ -934,13 +934,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p+=quantum_info->pad;
q++;
@@ -950,11 +950,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelBlue(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelGreen(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelRed(q,ScaleShortToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -973,11 +973,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelRed(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum(pixel));
+ SetPixelBlue(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -986,11 +986,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelBlue(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelGreen(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelRed(q,ScaleLongToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1006,11 +1006,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelRed(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum(pixel));
+ SetPixelBlue(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1023,11 +1023,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
q++;
}
break;
@@ -1048,13 +1048,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetBluePixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelBlue(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetGreenPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelGreen(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelRed(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelAlpha(q,ScaleCharToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1104,10 +1104,10 @@
}
switch (i)
{
- case 0: SetRedPixelComponent(q,quantum); break;
- case 1: SetGreenPixelComponent(q,quantum); break;
- case 2: SetBluePixelComponent(q,quantum); break;
- case 3: SetAlphaPixelComponent(q,quantum); break;
+ case 0: SetPixelRed(q,quantum); break;
+ case 1: SetPixelGreen(q,quantum); break;
+ case 2: SetPixelBlue(q,quantum); break;
+ case 3: SetPixelAlpha(q,quantum); break;
}
n++;
}
@@ -1119,16 +1119,16 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleShortToQuantum((unsigned short)
+ SetPixelRed(q,ScaleShortToQuantum((unsigned short)
(pixel << 6)));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleShortToQuantum((unsigned short)
+ SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
(pixel << 6)));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleShortToQuantum((unsigned short)
+ SetPixelBlue(q,ScaleShortToQuantum((unsigned short)
(pixel << 6)));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetAlphaPixelComponent(q,ScaleShortToQuantum((unsigned short)
+ SetPixelAlpha(q,ScaleShortToQuantum((unsigned short)
(pixel << 6)));
q++;
}
@@ -1144,16 +1144,16 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelAlpha(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p+=quantum_info->pad;
q++;
@@ -1163,13 +1163,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelBlue(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelGreen(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelRed(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelAlpha(q,ScaleShortToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1188,13 +1188,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelRed(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum(pixel));
+ SetPixelBlue(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelAlpha(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1203,13 +1203,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelBlue(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelGreen(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelRed(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelAlpha(q,ScaleLongToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1225,13 +1225,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelRed(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum(pixel));
+ SetPixelBlue(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelAlpha(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1244,13 +1244,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
q++;
}
break;
@@ -1279,20 +1279,20 @@
{
for (bit=0; bit < 8; bit++)
{
- SetRedPixelComponent(q,((*p) & (1 << (7-bit))) == 0 ?
+ SetPixelRed(q,((*p) & (1 << (7-bit))) == 0 ?
black : white);
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
}
p++;
}
for (bit=0; bit < (ssize_t) (number_pixels % 8); bit++)
{
- SetRedPixelComponent(q,((*p) & (0x01 << (7-bit))) == 0 ?
+ SetPixelRed(q,((*p) & (0x01 << (7-bit))) == 0 ?
black : white);
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
}
if (bit != 0)
@@ -1308,23 +1308,23 @@
for (x=0; x < ((ssize_t) number_pixels-1); x+=2)
{
pixel=(unsigned char) ((*p >> 4) & 0xf);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
pixel=(unsigned char) ((*p) & 0xf);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p++;
q++;
}
for (bit=0; bit < (ssize_t) (number_pixels % 2); bit++)
{
pixel=(unsigned char) (*p++ >> 4);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
}
break;
@@ -1339,10 +1339,10 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetRedPixelComponent(q,QuantumRange-ScaleCharToQuantum(pixel));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
- SetOpacityPixelComponent(q,OpaqueOpacity);
+ SetPixelRed(q,QuantumRange-ScaleCharToQuantum(pixel));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
+ SetPixelOpacity(q,OpaqueOpacity);
p+=quantum_info->pad;
q++;
}
@@ -1351,10 +1351,10 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
- SetOpacityPixelComponent(q,OpaqueOpacity);
+ SetPixelRed(q,ScaleCharToQuantum(pixel));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
+ SetPixelOpacity(q,OpaqueOpacity);
p+=quantum_info->pad;
q++;
}
@@ -1370,38 +1370,38 @@
for (x=0; x < (ssize_t) (number_pixels-2); x+=3)
{
p=PushLongPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 2) &
+ SetPixelRed(q,ScaleAnyToQuantum((pixel >> 2) &
0x3ff,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
- SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 12) &
+ SetPixelRed(q,ScaleAnyToQuantum((pixel >> 12) &
0x3ff,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
- SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 22) &
+ SetPixelRed(q,ScaleAnyToQuantum((pixel >> 22) &
0x3ff,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p+=quantum_info->pad;
q++;
}
p=PushLongPixel(endian,p,&pixel);
if (x++ < (ssize_t) (number_pixels-1))
{
- SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 2) &
+ SetPixelRed(q,ScaleAnyToQuantum((pixel >> 2) &
0x3ff,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
}
if (x++ < (ssize_t) number_pixels)
{
- SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 12) &
+ SetPixelRed(q,ScaleAnyToQuantum((pixel >> 12) &
0x3ff,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
}
break;
@@ -1409,38 +1409,38 @@
for (x=0; x < (ssize_t) (number_pixels-2); x+=3)
{
p=PushLongPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 22) &
+ SetPixelRed(q,ScaleAnyToQuantum((pixel >> 22) &
0x3ff,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
- SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 12) &
+ SetPixelRed(q,ScaleAnyToQuantum((pixel >> 12) &
0x3ff,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
- SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 2) &
+ SetPixelRed(q,ScaleAnyToQuantum((pixel >> 2) &
0x3ff,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p+=quantum_info->pad;
q++;
}
p=PushLongPixel(endian,p,&pixel);
if (x++ < (ssize_t) (number_pixels-1))
{
- SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 22) &
+ SetPixelRed(q,ScaleAnyToQuantum((pixel >> 22) &
0x3ff,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
}
if (x++ < (ssize_t) number_pixels)
{
- SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 12) &
+ SetPixelRed(q,ScaleAnyToQuantum((pixel >> 12) &
0x3ff,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
}
break;
@@ -1448,9 +1448,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p+=quantum_info->pad;
q++;
}
@@ -1467,26 +1467,26 @@
for (x=0; x < (ssize_t) (number_pixels-1); x+=2)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p+=quantum_info->pad;
q++;
}
for (bit=0; bit < (ssize_t) (number_pixels % 2); bit++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p+=quantum_info->pad;
q++;
}
@@ -1497,9 +1497,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p+=quantum_info->pad;
q++;
}
@@ -1515,9 +1515,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,QuantumRange-ScaleShortToQuantum(pixel));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,QuantumRange-ScaleShortToQuantum(pixel));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p+=quantum_info->pad;
q++;
}
@@ -1528,10 +1528,10 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p+=quantum_info->pad;
q++;
}
@@ -1540,9 +1540,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleShortToQuantum(pixel));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p+=quantum_info->pad;
q++;
}
@@ -1561,9 +1561,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p+=quantum_info->pad;
q++;
}
@@ -1572,9 +1572,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleLongToQuantum(pixel));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p+=quantum_info->pad;
q++;
}
@@ -1590,9 +1590,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p+=quantum_info->pad;
q++;
}
@@ -1605,9 +1605,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p+=quantum_info->pad;
q++;
}
@@ -1631,10 +1631,10 @@
{
pixel=(unsigned char)
(((*p) & (1 << (7-bit))) != 0 ? 0x00 : 0x01);
- SetRedPixelComponent(q,pixel == 0 ? 0 : QuantumRange);
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
- SetOpacityPixelComponent(q,((*p) & (1UL << (unsigned char)
+ SetPixelRed(q,pixel == 0 ? 0 : QuantumRange);
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
+ SetPixelOpacity(q,((*p) & (1UL << (unsigned char)
(6-bit))) == 0 ? TransparentOpacity : OpaqueOpacity);
q++;
}
@@ -1643,10 +1643,10 @@
for (bit=0; bit <= (ssize_t) (number_pixels % 4); bit+=2)
{
pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ? 0x00 : 0x01);
- SetRedPixelComponent(q,pixel != 0 ? 0 : QuantumRange);
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
- SetOpacityPixelComponent(q,((*p) & (1UL << (unsigned char)
+ SetPixelRed(q,pixel != 0 ? 0 : QuantumRange);
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
+ SetPixelOpacity(q,((*p) & (1UL << (unsigned char)
(6-bit))) == 0 ? TransparentOpacity : OpaqueOpacity);
q++;
}
@@ -1663,11 +1663,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=(unsigned char) ((*p >> 4) & 0xf);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
pixel=(unsigned char) ((*p) & 0xf);
- SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
p++;
q++;
}
@@ -1681,11 +1681,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleCharToQuantum(pixel));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p=PushCharPixel(p,&pixel);
- SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelAlpha(q,ScaleCharToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1697,11 +1697,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelOpacity(q,ScaleAnyToQuantum(pixel,range));
p+=quantum_info->pad;
q++;
}
@@ -1713,11 +1713,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetOpacityPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelOpacity(q,ScaleAnyToQuantum(pixel,range));
p+=quantum_info->pad;
q++;
}
@@ -1733,12 +1733,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p=PushShortPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelAlpha(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p+=quantum_info->pad;
q++;
@@ -1748,11 +1748,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleShortToQuantum(pixel));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p=PushShortPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelAlpha(q,ScaleShortToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1771,11 +1771,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelAlpha(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1784,11 +1784,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleLongToQuantum(pixel));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p=PushLongPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelAlpha(q,ScaleLongToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1804,11 +1804,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelAlpha(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1821,11 +1821,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
p+=quantum_info->pad;
q++;
}
@@ -1847,7 +1847,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelRed(q,ScaleCharToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1863,7 +1863,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p+=quantum_info->pad;
q++;
@@ -1873,7 +1873,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelRed(q,ScaleShortToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1892,7 +1892,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelRed(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1901,7 +1901,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelRed(q,ScaleLongToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1917,7 +1917,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelRed(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1930,7 +1930,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
p+=quantum_info->pad;
q++;
}
@@ -1952,7 +1952,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetGreenPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelGreen(q,ScaleCharToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1968,7 +1968,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p+=quantum_info->pad;
q++;
@@ -1978,7 +1978,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelGreen(q,ScaleShortToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -1997,7 +1997,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2006,7 +2006,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelGreen(q,ScaleLongToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2022,7 +2022,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2035,7 +2035,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
p+=quantum_info->pad;
q++;
}
@@ -2057,7 +2057,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetBluePixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelBlue(q,ScaleCharToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2073,7 +2073,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p+=quantum_info->pad;
q++;
@@ -2083,7 +2083,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelBlue(q,ScaleShortToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2102,7 +2102,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum(pixel));
+ SetPixelBlue(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2111,7 +2111,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelBlue(q,ScaleLongToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2127,7 +2127,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum(pixel));
+ SetPixelBlue(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2140,7 +2140,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
p+=quantum_info->pad;
q++;
}
@@ -2161,7 +2161,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelAlpha(q,ScaleCharToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2177,7 +2177,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelAlpha(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p+=quantum_info->pad;
q++;
@@ -2187,7 +2187,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelAlpha(q,ScaleShortToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2206,7 +2206,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelAlpha(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2215,7 +2215,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelAlpha(q,ScaleLongToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2231,7 +2231,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelAlpha(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2244,7 +2244,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
p+=quantum_info->pad;
q++;
}
@@ -2271,7 +2271,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetIndexPixelComponent(indexes+x,ScaleCharToQuantum(pixel));
+ SetPixelIndex(indexes+x,ScaleCharToQuantum(pixel));
p+=quantum_info->pad;
}
break;
@@ -2286,7 +2286,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetIndexPixelComponent(indexes+x,ClampToQuantum((MagickRealType)
+ SetPixelIndex(indexes+x,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p+=quantum_info->pad;
}
@@ -2295,7 +2295,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetIndexPixelComponent(indexes+x,ScaleShortToQuantum(pixel));
+ SetPixelIndex(indexes+x,ScaleShortToQuantum(pixel));
p+=quantum_info->pad;
}
break;
@@ -2313,7 +2313,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel));
+ SetPixelIndex(indexes+x,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2322,7 +2322,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetIndexPixelComponent(indexes+x,ScaleLongToQuantum(pixel));
+ SetPixelIndex(indexes+x,ScaleLongToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2338,7 +2338,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel));
+ SetPixelIndex(indexes+x,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2351,7 +2351,7 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetIndexPixelComponent(indexes+x,ScaleAnyToQuantum(pixel,range));
+ SetPixelIndex(indexes+x,ScaleAnyToQuantum(pixel,range));
p+=quantum_info->pad;
q++;
}
@@ -2373,12 +2373,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelRed(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetGreenPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelGreen(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetBluePixelComponent(q,ScaleCharToQuantum(pixel));
- SetOpacityPixelComponent(q,OpaqueOpacity);
+ SetPixelBlue(q,ScaleCharToQuantum(pixel));
+ SetPixelOpacity(q,OpaqueOpacity);
p+=quantum_info->pad;
q++;
}
@@ -2392,11 +2392,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum((pixel >> 22) &
+ SetPixelRed(q,ScaleAnyToQuantum((pixel >> 22) &
0x3ff,range));
- SetGreenPixelComponent(q,ScaleAnyToQuantum((pixel >> 12) &
+ SetPixelGreen(q,ScaleAnyToQuantum((pixel >> 12) &
0x3ff,range));
- SetBluePixelComponent(q,ScaleAnyToQuantum((pixel >> 2) &
+ SetPixelBlue(q,ScaleAnyToQuantum((pixel >> 2) &
0x3ff,range));
p+=quantum_info->pad;
q++;
@@ -2408,11 +2408,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
q++;
}
break;
@@ -2420,11 +2420,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
q++;
}
break;
@@ -2445,19 +2445,19 @@
default:
case 0:
{
- SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
break;
}
case 1:
{
- SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
break;
}
case 2:
{
- SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
q++;
break;
@@ -2469,19 +2469,19 @@
default:
case 0:
{
- SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
break;
}
case 1:
{
- SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
break;
}
case 2:
{
- SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
q++;
break;
@@ -2497,19 +2497,19 @@
default:
case 0:
{
- SetRedPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
break;
}
case 1:
{
- SetGreenPixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
break;
}
case 2:
{
- SetBluePixelComponent(q,ScaleAnyToQuantum((QuantumAny)
+ SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
(pixel >> 4),range));
q++;
break;
@@ -2526,11 +2526,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
q++;
}
break;
@@ -2538,11 +2538,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
q++;
}
break;
@@ -2557,13 +2557,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p+=quantum_info->pad;
q++;
@@ -2573,11 +2573,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelRed(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelGreen(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelBlue(q,ScaleShortToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2596,11 +2596,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelRed(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum(pixel));
+ SetPixelBlue(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2609,11 +2609,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelRed(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelGreen(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelBlue(q,ScaleLongToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2629,11 +2629,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelRed(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum(pixel));
+ SetPixelBlue(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2646,11 +2646,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
q++;
}
break;
@@ -2672,13 +2672,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelRed(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetGreenPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelGreen(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetBluePixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelBlue(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelAlpha(q,ScaleCharToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2728,10 +2728,10 @@
}
switch (i)
{
- case 0: SetRedPixelComponent(q,quantum); break;
- case 1: SetGreenPixelComponent(q,quantum); break;
- case 2: SetBluePixelComponent(q,quantum); break;
- case 3: SetAlphaPixelComponent(q,quantum); break;
+ case 0: SetPixelRed(q,quantum); break;
+ case 1: SetPixelGreen(q,quantum); break;
+ case 2: SetPixelBlue(q,quantum); break;
+ case 3: SetPixelAlpha(q,quantum); break;
}
n++;
}
@@ -2743,16 +2743,16 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleShortToQuantum((unsigned short)
+ SetPixelRed(q,ScaleShortToQuantum((unsigned short)
(pixel << 6)));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleShortToQuantum((unsigned short)
+ SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
(pixel << 6)));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleShortToQuantum((unsigned short)
+ SetPixelBlue(q,ScaleShortToQuantum((unsigned short)
(pixel << 6)));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetAlphaPixelComponent(q,ScaleShortToQuantum((unsigned short)
+ SetPixelAlpha(q,ScaleShortToQuantum((unsigned short)
(pixel << 6)));
q++;
}
@@ -2768,16 +2768,16 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelAlpha(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p+=quantum_info->pad;
q++;
@@ -2787,13 +2787,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelRed(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelGreen(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelBlue(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelAlpha(q,ScaleShortToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2812,13 +2812,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelRed(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum(pixel));
+ SetPixelBlue(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelAlpha(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2827,13 +2827,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelRed(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelGreen(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelBlue(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelAlpha(q,ScaleLongToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2849,13 +2849,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelRed(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum(pixel));
+ SetPixelBlue(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelAlpha(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2868,13 +2868,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
q++;
}
break;
@@ -2900,13 +2900,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelRed(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetGreenPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelGreen(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetBluePixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelBlue(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetIndexPixelComponent(indexes+x,ScaleCharToQuantum(pixel));
+ SetPixelIndex(indexes+x,ScaleCharToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2922,16 +2922,16 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetIndexPixelComponent(indexes+x,ClampToQuantum(
+ SetPixelIndex(indexes+x,ClampToQuantum(
(MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)));
p+=quantum_info->pad;
q++;
@@ -2941,13 +2941,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelRed(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelGreen(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelBlue(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetIndexPixelComponent(indexes+x,ScaleShortToQuantum(pixel));
+ SetPixelIndex(indexes+x,ScaleShortToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2966,13 +2966,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelRed(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum(pixel));
+ SetPixelBlue(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel));
+ SetPixelIndex(indexes+x,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -2981,13 +2981,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelRed(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelGreen(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelBlue(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetIndexPixelComponent(indexes+x,ScaleLongToQuantum(pixel));
+ SetPixelIndex(indexes+x,ScaleLongToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -3003,13 +3003,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelRed(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum(pixel));
+ SetPixelBlue(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel));
+ SetPixelIndex(indexes+x,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -3022,13 +3022,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetIndexPixelComponent(indexes+x,ScaleAnyToQuantum(pixel,range));
+ SetPixelIndex(indexes+x,ScaleAnyToQuantum(pixel,range));
q++;
}
break;
@@ -3055,15 +3055,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetRedPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelRed(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetGreenPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelGreen(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetBluePixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelBlue(q,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetIndexPixelComponent(indexes+x,ScaleCharToQuantum(pixel));
+ SetPixelIndex(indexes+x,ScaleCharToQuantum(pixel));
p=PushCharPixel(p,&pixel);
- SetAlphaPixelComponent(q,ScaleCharToQuantum(pixel));
+ SetPixelAlpha(q,ScaleCharToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -3079,19 +3079,19 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelRed(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelGreen(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelBlue(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetIndexPixelComponent(indexes+x,ClampToQuantum(
+ SetPixelIndex(indexes+x,ClampToQuantum(
(MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)));
p=PushShortPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum((MagickRealType)
+ SetPixelAlpha(q,ClampToQuantum((MagickRealType)
QuantumRange*HalfToSinglePrecision(pixel)));
p+=quantum_info->pad;
q++;
@@ -3101,15 +3101,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelRed(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelGreen(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelBlue(q,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetIndexPixelComponent(indexes+x,ScaleShortToQuantum(pixel));
+ SetPixelIndex(indexes+x,ScaleShortToQuantum(pixel));
p=PushShortPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ScaleShortToQuantum(pixel));
+ SetPixelAlpha(q,ScaleShortToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -3128,15 +3128,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelRed(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum(pixel));
+ SetPixelBlue(q,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel));
+ SetPixelIndex(indexes+x,ClampToQuantum(pixel));
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelAlpha(q,ClampToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -3145,15 +3145,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetRedPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelRed(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetGreenPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelGreen(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetBluePixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelBlue(q,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetIndexPixelComponent(indexes+x,ScaleLongToQuantum(pixel));
+ SetPixelIndex(indexes+x,ScaleLongToQuantum(pixel));
p=PushLongPixel(endian,p,&pixel);
- SetAlphaPixelComponent(q,ScaleLongToQuantum(pixel));
+ SetPixelAlpha(q,ScaleLongToQuantum(pixel));
p+=quantum_info->pad;
q++;
}
@@ -3169,15 +3169,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetRedPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelRed(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetGreenPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelGreen(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetBluePixelComponent(q,ClampToQuantum(pixel));
+ SetPixelBlue(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetIndexPixelComponent(indexes+x,ClampToQuantum(pixel));
+ SetPixelIndex(indexes+x,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetAlphaPixelComponent(q,ClampToQuantum(pixel));
+ SetPixelAlpha(q,ClampToQuantum(pixel));
p=PushDoublePixel(&quantum_state,p,&pixel);
p+=quantum_info->pad;
q++;
@@ -3191,15 +3191,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetIndexPixelComponent(indexes+x,ScaleAnyToQuantum(pixel,range));
+ SetPixelIndex(indexes+x,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
q++;
}
break;
@@ -3260,13 +3260,13 @@
n++;
}
p+=quantum_info->pad;
- SetRedPixelComponent(q,cbcr[1]);
- SetGreenPixelComponent(q,cbcr[0]);
- SetBluePixelComponent(q,cbcr[2]);
+ SetPixelRed(q,cbcr[1]);
+ SetPixelGreen(q,cbcr[0]);
+ SetPixelBlue(q,cbcr[2]);
q++;
- SetRedPixelComponent(q,cbcr[3]);
- SetGreenPixelComponent(q,cbcr[0]);
- SetBluePixelComponent(q,cbcr[2]);
+ SetPixelRed(q,cbcr[3]);
+ SetPixelGreen(q,cbcr[0]);
+ SetPixelBlue(q,cbcr[2]);
q++;
}
break;
@@ -3278,9 +3278,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
q++;
}
break;
@@ -3304,9 +3304,9 @@
q=GetCacheViewAuthenticPixelQueue(image_view);
for (x=0; x < (ssize_t) number_pixels; x++)
{
- quantum=GetRedPixelComponent(q);
- SetRedPixelComponent(q,GetGreenPixelComponent(q));
- SetGreenPixelComponent(q,quantum);
+ quantum=GetPixelRed(q);
+ SetPixelRed(q,GetPixelGreen(q));
+ SetPixelGreen(q,quantum);
q++;
}
}
@@ -3320,7 +3320,7 @@
q=GetCacheViewAuthenticPixelQueue(image_view);
for (x=0; x < (ssize_t) number_pixels; x++)
{
- SetOpacityPixelComponent(q,GetAlphaPixelComponent(q));
+ SetPixelOpacity(q,GetPixelAlpha(q));
q++;
}
}
@@ -3340,14 +3340,14 @@
q=GetCacheViewAuthenticPixelQueue(image_view);
for (x=0; x < (ssize_t) number_pixels; x++)
{
- alpha=QuantumScale*GetAlphaPixelComponent(q);
+ alpha=QuantumScale*GetPixelAlpha(q);
alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha);
- SetRedPixelComponent(q,ClampToQuantum(alpha*
- GetRedPixelComponent(q)));
- SetGreenPixelComponent(q,ClampToQuantum(alpha*
- GetGreenPixelComponent(q)));
- SetBluePixelComponent(q,ClampToQuantum(alpha*
- GetBluePixelComponent(q)));
+ SetPixelRed(q,ClampToQuantum(alpha*
+ GetPixelRed(q)));
+ SetPixelGreen(q,ClampToQuantum(alpha*
+ GetPixelGreen(q)));
+ SetPixelBlue(q,ClampToQuantum(alpha*
+ GetPixelBlue(q)));
q++;
}
}
diff --git a/magick/resize.c b/magick/resize.c
index d969a16..0ca9fcb 100644
--- a/magick/resize.c
+++ b/magick/resize.c
@@ -2178,15 +2178,15 @@
j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
(contribution[i].pixel-contribution[0].pixel);
alpha=contribution[i].weight;
- pixel.red+=alpha*GetRedPixelComponent(p+j);
- pixel.green+=alpha*GetGreenPixelComponent(p+j);
- pixel.blue+=alpha*GetBluePixelComponent(p+j);
- pixel.opacity+=alpha*GetOpacityPixelComponent(p+j);
+ pixel.red+=alpha*GetPixelRed(p+j);
+ pixel.green+=alpha*GetPixelGreen(p+j);
+ pixel.blue+=alpha*GetPixelBlue(p+j);
+ pixel.opacity+=alpha*GetPixelOpacity(p+j);
}
- SetRedPixelComponent(q,ClampToQuantum(pixel.red));
- SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
- SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelRed(q,ClampToQuantum(pixel.red));
+ SetPixelGreen(q,ClampToQuantum(pixel.green));
+ SetPixelBlue(q,ClampToQuantum(pixel.blue));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
if ((image->colorspace == CMYKColorspace) &&
(resize_image->colorspace == CMYKColorspace))
{
@@ -2195,9 +2195,9 @@
j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
(contribution[i].pixel-contribution[0].pixel);
alpha=contribution[i].weight;
- pixel.index+=alpha*GetIndexPixelComponent(indexes+j);
+ pixel.index+=alpha*GetPixelIndex(indexes+j);
}
- SetIndexPixelComponent(resize_indexes+y,ClampToQuantum(
+ SetPixelIndex(resize_indexes+y,ClampToQuantum(
pixel.index));
}
}
@@ -2212,18 +2212,18 @@
j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
(contribution[i].pixel-contribution[0].pixel);
alpha=contribution[i].weight*QuantumScale*
- GetAlphaPixelComponent(p+j);
- pixel.red+=alpha*GetRedPixelComponent(p+j);
- pixel.green+=alpha*GetGreenPixelComponent(p+j);
- pixel.blue+=alpha*GetBluePixelComponent(p+j);
- pixel.opacity+=contribution[i].weight*GetOpacityPixelComponent(p+j);
+ GetPixelAlpha(p+j);
+ pixel.red+=alpha*GetPixelRed(p+j);
+ pixel.green+=alpha*GetPixelGreen(p+j);
+ pixel.blue+=alpha*GetPixelBlue(p+j);
+ pixel.opacity+=contribution[i].weight*GetPixelOpacity(p+j);
gamma+=alpha;
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
- SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
- SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
if ((image->colorspace == CMYKColorspace) &&
(resize_image->colorspace == CMYKColorspace))
{
@@ -2232,10 +2232,10 @@
j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
(contribution[i].pixel-contribution[0].pixel);
alpha=contribution[i].weight*QuantumScale*
- GetAlphaPixelComponent(p+j);
- pixel.index+=alpha*GetIndexPixelComponent(indexes+j);
+ GetPixelAlpha(p+j);
+ pixel.index+=alpha*GetPixelIndex(indexes+j);
}
- SetIndexPixelComponent(resize_indexes+y,ClampToQuantum(gamma*
+ SetPixelIndex(resize_indexes+y,ClampToQuantum(gamma*
pixel.index));
}
}
@@ -2246,7 +2246,7 @@
1.0)+0.5);
j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
(contribution[i-start].pixel-contribution[0].pixel);
- SetIndexPixelComponent(resize_indexes+y,GetIndexPixelComponent(
+ SetPixelIndex(resize_indexes+y,GetPixelIndex(
indexes+j));
}
q++;
@@ -2423,15 +2423,15 @@
j=(ssize_t) ((contribution[i].pixel-contribution[0].pixel)*
image->columns+x);
alpha=contribution[i].weight;
- pixel.red+=alpha*GetRedPixelComponent(p+j);
- pixel.green+=alpha*GetGreenPixelComponent(p+j);
- pixel.blue+=alpha*GetBluePixelComponent(p+j);
- pixel.opacity+=alpha*GetOpacityPixelComponent(p+j);
+ pixel.red+=alpha*GetPixelRed(p+j);
+ pixel.green+=alpha*GetPixelGreen(p+j);
+ pixel.blue+=alpha*GetPixelBlue(p+j);
+ pixel.opacity+=alpha*GetPixelOpacity(p+j);
}
- SetRedPixelComponent(q,ClampToQuantum(pixel.red));
- SetGreenPixelComponent(q,ClampToQuantum(pixel.green));
- SetBluePixelComponent(q,ClampToQuantum(pixel.blue));
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelRed(q,ClampToQuantum(pixel.red));
+ SetPixelGreen(q,ClampToQuantum(pixel.green));
+ SetPixelBlue(q,ClampToQuantum(pixel.blue));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
if ((image->colorspace == CMYKColorspace) &&
(resize_image->colorspace == CMYKColorspace))
{
@@ -2440,9 +2440,9 @@
j=(ssize_t) ((contribution[i].pixel-contribution[0].pixel)*
image->columns+x);
alpha=contribution[i].weight;
- pixel.index+=alpha*GetIndexPixelComponent(indexes+j);
+ pixel.index+=alpha*GetPixelIndex(indexes+j);
}
- SetIndexPixelComponent(resize_indexes+x,ClampToQuantum(
+ SetPixelIndex(resize_indexes+x,ClampToQuantum(
pixel.index));
}
}
@@ -2457,18 +2457,18 @@
j=(ssize_t) ((contribution[i].pixel-contribution[0].pixel)*
image->columns+x);
alpha=contribution[i].weight*QuantumScale*
- GetAlphaPixelComponent(p+j);
- pixel.red+=alpha*GetRedPixelComponent(p+j);
- pixel.green+=alpha*GetGreenPixelComponent(p+j);
- pixel.blue+=alpha*GetBluePixelComponent(p+j);
- pixel.opacity+=contribution[i].weight*GetOpacityPixelComponent(p+j);
+ GetPixelAlpha(p+j);
+ pixel.red+=alpha*GetPixelRed(p+j);
+ pixel.green+=alpha*GetPixelGreen(p+j);
+ pixel.blue+=alpha*GetPixelBlue(p+j);
+ pixel.opacity+=contribution[i].weight*GetPixelOpacity(p+j);
gamma+=alpha;
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- SetRedPixelComponent(q,ClampToQuantum(gamma*pixel.red));
- SetGreenPixelComponent(q,ClampToQuantum(gamma*pixel.green));
- SetBluePixelComponent(q,ClampToQuantum(gamma*pixel.blue));
- SetOpacityPixelComponent(q,ClampToQuantum(pixel.opacity));
+ SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
+ SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
if ((image->colorspace == CMYKColorspace) &&
(resize_image->colorspace == CMYKColorspace))
{
@@ -2477,10 +2477,10 @@
j=(ssize_t) ((contribution[i].pixel-contribution[0].pixel)*
image->columns+x);
alpha=contribution[i].weight*QuantumScale*
- GetAlphaPixelComponent(p+j);
- pixel.index+=alpha*GetIndexPixelComponent(indexes+j);
+ GetPixelAlpha(p+j);
+ pixel.index+=alpha*GetPixelIndex(indexes+j);
}
- SetIndexPixelComponent(resize_indexes+x,ClampToQuantum(gamma*
+ SetPixelIndex(resize_indexes+x,ClampToQuantum(gamma*
pixel.index));
}
}
@@ -2491,8 +2491,8 @@
1.0)+0.5);
j=(ssize_t) ((contribution[i-start].pixel-contribution[0].pixel)*
image->columns+x);
- SetIndexPixelComponent(resize_indexes+x,
- GetIndexPixelComponent(indexes+j));
+ SetPixelIndex(resize_indexes+x,
+ GetPixelIndex(indexes+j));
}
q++;
}
@@ -2755,8 +2755,8 @@
if ((image->storage_class == PseudoClass) ||
(image->colorspace == CMYKColorspace))
for (x=0; x < (ssize_t) sample_image->columns; x++)
- SetIndexPixelComponent(sample_indexes+x,
- GetIndexPixelComponent(indexes+x_offset[x]));
+ SetPixelIndex(sample_indexes+x,
+ GetPixelIndex(indexes+x_offset[x]));
if (SyncCacheViewAuthenticPixels(sample_view,exception) == MagickFalse)
status=MagickFalse;
if (image->progress_monitor != (MagickProgressMonitor) NULL)
@@ -2944,15 +2944,15 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->matte != MagickFalse)
- alpha=QuantumScale*GetAlphaPixelComponent(p);
- x_vector[x].red=(MagickRealType) (alpha*GetRedPixelComponent(p));
- x_vector[x].green=(MagickRealType) (alpha*GetGreenPixelComponent(p));
- x_vector[x].blue=(MagickRealType) (alpha*GetBluePixelComponent(p));
+ alpha=QuantumScale*GetPixelAlpha(p);
+ x_vector[x].red=(MagickRealType) (alpha*GetPixelRed(p));
+ x_vector[x].green=(MagickRealType) (alpha*GetPixelGreen(p));
+ x_vector[x].blue=(MagickRealType) (alpha*GetPixelBlue(p));
if (image->matte != MagickFalse)
- x_vector[x].opacity=(MagickRealType) GetOpacityPixelComponent(p);
+ x_vector[x].opacity=(MagickRealType) GetPixelOpacity(p);
if (indexes != (IndexPacket *) NULL)
x_vector[x].index=(MagickRealType) (alpha*
- GetIndexPixelComponent(indexes+x));
+ GetPixelIndex(indexes+x));
p++;
}
}
@@ -2977,19 +2977,19 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->matte != MagickFalse)
- alpha=QuantumScale*GetAlphaPixelComponent(p);
+ alpha=QuantumScale*GetPixelAlpha(p);
x_vector[x].red=(MagickRealType) (alpha*
- GetRedPixelComponent(p));
+ GetPixelRed(p));
x_vector[x].green=(MagickRealType) (alpha*
- GetGreenPixelComponent(p));
+ GetPixelGreen(p));
x_vector[x].blue=(MagickRealType) (alpha*
- GetBluePixelComponent(p));
+ GetPixelBlue(p));
if (image->matte != MagickFalse)
x_vector[x].opacity=(MagickRealType)
- GetOpacityPixelComponent(p);
+ GetPixelOpacity(p);
if (indexes != (IndexPacket *) NULL)
x_vector[x].index=(MagickRealType) (alpha*
- GetIndexPixelComponent(indexes+x));
+ GetPixelIndex(indexes+x));
p++;
}
number_rows++;
@@ -3021,19 +3021,19 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->matte != MagickFalse)
- alpha=QuantumScale*GetAlphaPixelComponent(p);
+ alpha=QuantumScale*GetPixelAlpha(p);
x_vector[x].red=(MagickRealType) (alpha*
- GetRedPixelComponent(p));
+ GetPixelRed(p));
x_vector[x].green=(MagickRealType) (alpha*
- GetGreenPixelComponent(p));
+ GetPixelGreen(p));
x_vector[x].blue=(MagickRealType) (alpha*
- GetBluePixelComponent(p));
+ GetPixelBlue(p));
if (image->matte != MagickFalse)
x_vector[x].opacity=(MagickRealType)
- GetOpacityPixelComponent(p);
+ GetPixelOpacity(p);
if (indexes != (IndexPacket *) NULL)
x_vector[x].index=(MagickRealType) (alpha*
- GetIndexPixelComponent(indexes+x));
+ GetPixelIndex(indexes+x));
p++;
}
number_rows++;
@@ -3078,13 +3078,13 @@
if (scale_image->matte != MagickFalse)
alpha=QuantumScale*(QuantumRange-s->opacity);
alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha);
- SetRedPixelComponent(q,ClampToQuantum(alpha*s->red));
- SetGreenPixelComponent(q,ClampToQuantum(alpha*s->green));
- SetBluePixelComponent(q,ClampToQuantum(alpha*s->blue));
+ SetPixelRed(q,ClampToQuantum(alpha*s->red));
+ SetPixelGreen(q,ClampToQuantum(alpha*s->green));
+ SetPixelBlue(q,ClampToQuantum(alpha*s->blue));
if (scale_image->matte != MagickFalse)
- SetOpacityPixelComponent(q,ClampToQuantum(s->opacity));
+ SetPixelOpacity(q,ClampToQuantum(s->opacity));
if (scale_indexes != (IndexPacket *) NULL)
- SetIndexPixelComponent(scale_indexes+x,ClampToQuantum(alpha*
+ SetPixelIndex(scale_indexes+x,ClampToQuantum(alpha*
s->index));
q++;
s++;
@@ -3178,13 +3178,13 @@
if (scale_image->matte != MagickFalse)
alpha=QuantumScale*(QuantumRange-s->opacity);
alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha);
- SetRedPixelComponent(q,ClampToQuantum(alpha*t->red));
- SetGreenPixelComponent(q,ClampToQuantum(alpha*t->green));
- SetBluePixelComponent(q,ClampToQuantum(alpha*t->blue));
+ SetPixelRed(q,ClampToQuantum(alpha*t->red));
+ SetPixelGreen(q,ClampToQuantum(alpha*t->green));
+ SetPixelBlue(q,ClampToQuantum(alpha*t->blue));
if (scale_image->matte != MagickFalse)
- SetOpacityPixelComponent(q,ClampToQuantum(t->opacity));
+ SetPixelOpacity(q,ClampToQuantum(t->opacity));
if (scale_indexes != (IndexPacket *) NULL)
- SetIndexPixelComponent(scale_indexes+x,ClampToQuantum(alpha*
+ SetPixelIndex(scale_indexes+x,ClampToQuantum(alpha*
t->index));
t++;
q++;
diff --git a/magick/segment.c b/magick/segment.c
index f19300e..922c5e6 100644
--- a/magick/segment.c
+++ b/magick/segment.c
@@ -366,27 +366,27 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
- if (((ssize_t) ScaleQuantumToChar(GetRedPixelComponent(p)) >=
+ if (((ssize_t) ScaleQuantumToChar(GetPixelRed(p)) >=
(cluster->red.left-SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetRedPixelComponent(p)) <=
+ ((ssize_t) ScaleQuantumToChar(GetPixelRed(p)) <=
(cluster->red.right+SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetGreenPixelComponent(p)) >=
+ ((ssize_t) ScaleQuantumToChar(GetPixelGreen(p)) >=
(cluster->green.left-SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetGreenPixelComponent(p)) <=
+ ((ssize_t) ScaleQuantumToChar(GetPixelGreen(p)) <=
(cluster->green.right+SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetBluePixelComponent(p)) >=
+ ((ssize_t) ScaleQuantumToChar(GetPixelBlue(p)) >=
(cluster->blue.left-SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetBluePixelComponent(p)) <=
+ ((ssize_t) ScaleQuantumToChar(GetPixelBlue(p)) <=
(cluster->blue.right+SafeMargin)))
{
/*
Count this pixel.
*/
count++;
- cluster->red.center+=(MagickRealType) ScaleQuantumToChar(GetRedPixelComponent(p));
+ cluster->red.center+=(MagickRealType) ScaleQuantumToChar(GetPixelRed(p));
cluster->green.center+=(MagickRealType)
- ScaleQuantumToChar(GetGreenPixelComponent(p));
- cluster->blue.center+=(MagickRealType) ScaleQuantumToChar(GetBluePixelComponent(p));
+ ScaleQuantumToChar(GetPixelGreen(p));
+ cluster->blue.center+=(MagickRealType) ScaleQuantumToChar(GetPixelBlue(p));
cluster->count++;
break;
}
@@ -558,7 +558,7 @@
indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetIndexPixelComponent(indexes+x,0);
+ SetPixelIndex(indexes+x,0);
for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
{
if (((ssize_t) ScaleQuantumToChar(q->red) >=
@@ -577,7 +577,7 @@
/*
Classify this pixel.
*/
- SetIndexPixelComponent(indexes+x,cluster->id);
+ SetPixelIndex(indexes+x,cluster->id);
break;
}
}
@@ -603,21 +603,21 @@
sum=0.0;
p=image->colormap+j;
distance_squared=squares[(ssize_t) ScaleQuantumToChar(q->red)-
- (ssize_t) ScaleQuantumToChar(GetRedPixelComponent(p))]+
+ (ssize_t) ScaleQuantumToChar(GetPixelRed(p))]+
squares[(ssize_t) ScaleQuantumToChar(q->green)-
- (ssize_t) ScaleQuantumToChar(GetGreenPixelComponent(p))]+
+ (ssize_t) ScaleQuantumToChar(GetPixelGreen(p))]+
squares[(ssize_t) ScaleQuantumToChar(q->blue)-
- (ssize_t) ScaleQuantumToChar(GetBluePixelComponent(p))];
+ (ssize_t) ScaleQuantumToChar(GetPixelBlue(p))];
numerator=distance_squared;
for (k=0; k < (ssize_t) image->colors; k++)
{
p=image->colormap+k;
distance_squared=squares[(ssize_t) ScaleQuantumToChar(q->red)-
- (ssize_t) ScaleQuantumToChar(GetRedPixelComponent(p))]+
+ (ssize_t) ScaleQuantumToChar(GetPixelRed(p))]+
squares[(ssize_t) ScaleQuantumToChar(q->green)-
- (ssize_t) ScaleQuantumToChar(GetGreenPixelComponent(p))]+
+ (ssize_t) ScaleQuantumToChar(GetPixelGreen(p))]+
squares[(ssize_t) ScaleQuantumToChar(q->blue)-
- (ssize_t) ScaleQuantumToChar(GetBluePixelComponent(p))];
+ (ssize_t) ScaleQuantumToChar(GetPixelBlue(p))];
ratio=numerator/distance_squared;
sum+=SegmentPower(ratio);
}
@@ -627,7 +627,7 @@
Classify this pixel.
*/
local_minima=1.0/sum;
- SetIndexPixelComponent(indexes+x,j);
+ SetPixelIndex(indexes+x,j);
}
}
}
@@ -1098,17 +1098,17 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
- if (((ssize_t) ScaleQuantumToChar(GetRedPixelComponent(p)) >=
+ if (((ssize_t) ScaleQuantumToChar(GetPixelRed(p)) >=
(cluster->red.left-SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetRedPixelComponent(p)) <=
+ ((ssize_t) ScaleQuantumToChar(GetPixelRed(p)) <=
(cluster->red.right+SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetGreenPixelComponent(p)) >=
+ ((ssize_t) ScaleQuantumToChar(GetPixelGreen(p)) >=
(cluster->green.left-SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetGreenPixelComponent(p)) <=
+ ((ssize_t) ScaleQuantumToChar(GetPixelGreen(p)) <=
(cluster->green.right+SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetBluePixelComponent(p)) >=
+ ((ssize_t) ScaleQuantumToChar(GetPixelBlue(p)) >=
(cluster->blue.left-SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetBluePixelComponent(p)) <=
+ ((ssize_t) ScaleQuantumToChar(GetPixelBlue(p)) <=
(cluster->blue.right+SafeMargin)))
{
/*
@@ -1116,11 +1116,11 @@
*/
count++;
cluster->red.center+=(MagickRealType)
- ScaleQuantumToChar(GetRedPixelComponent(p));
+ ScaleQuantumToChar(GetPixelRed(p));
cluster->green.center+=(MagickRealType)
- ScaleQuantumToChar(GetGreenPixelComponent(p));
+ ScaleQuantumToChar(GetPixelGreen(p));
cluster->blue.center+=(MagickRealType)
- ScaleQuantumToChar(GetBluePixelComponent(p));
+ ScaleQuantumToChar(GetPixelBlue(p));
cluster->count++;
break;
}
@@ -1262,9 +1262,9 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- histogram[Red][(ssize_t) ScaleQuantumToChar(GetRedPixelComponent(p))]++;
- histogram[Green][(ssize_t) ScaleQuantumToChar(GetGreenPixelComponent(p))]++;
- histogram[Blue][(ssize_t) ScaleQuantumToChar(GetBluePixelComponent(p))]++;
+ histogram[Red][(ssize_t) ScaleQuantumToChar(GetPixelRed(p))]++;
+ histogram[Green][(ssize_t) ScaleQuantumToChar(GetPixelGreen(p))]++;
+ histogram[Blue][(ssize_t) ScaleQuantumToChar(GetPixelBlue(p))]++;
p++;
}
}
diff --git a/magick/shear.c b/magick/shear.c
index 6bbdd07..58c0eff 100644
--- a/magick/shear.c
+++ b/magick/shear.c
@@ -739,9 +739,9 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
byte<<=1;
- if (((MagickRealType) GetRedPixelComponent(p) < threshold) ||
- ((MagickRealType) GetGreenPixelComponent(p) < threshold) ||
- ((MagickRealType) GetBluePixelComponent(p) < threshold))
+ if (((MagickRealType) GetPixelRed(p) < threshold) ||
+ ((MagickRealType) GetPixelGreen(p) < threshold) ||
+ ((MagickRealType) GetPixelBlue(p) < threshold))
byte|=0x01;
bit++;
if (bit == 8)
@@ -790,9 +790,9 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
byte<<=1;
- if (((MagickRealType) GetRedPixelComponent(p) < threshold) ||
- ((MagickRealType) GetGreenPixelComponent(p) < threshold) ||
- ((MagickRealType) GetBluePixelComponent(p) < threshold))
+ if (((MagickRealType) GetPixelRed(p) < threshold) ||
+ ((MagickRealType) GetPixelGreen(p) < threshold) ||
+ ((MagickRealType) GetPixelBlue(p) < threshold))
byte|=0x01;
bit++;
if (bit == 8)
@@ -856,10 +856,10 @@
{
if ((x >= offset) && (x < ((ssize_t) image->columns-offset)))
continue;
- background.red+=QuantumScale*GetRedPixelComponent(p);
- background.green+=QuantumScale*GetGreenPixelComponent(p);
- background.blue+=QuantumScale*GetBluePixelComponent(p);
- background.opacity+=QuantumScale*GetOpacityPixelComponent(p);
+ background.red+=QuantumScale*GetPixelRed(p);
+ background.green+=QuantumScale*GetPixelGreen(p);
+ background.blue+=QuantumScale*GetPixelBlue(p);
+ background.opacity+=QuantumScale*GetPixelOpacity(p);
count++;
p++;
}
@@ -1238,8 +1238,8 @@
if ((indexes != (IndexPacket *) NULL) &&
(rotate_indexes != (IndexPacket *) NULL))
for (x=0; x < (ssize_t) image->columns; x++)
- SetIndexPixelComponent(rotate_indexes+image->columns-x-1,
- GetIndexPixelComponent(indexes+x));
+ SetPixelIndex(rotate_indexes+image->columns-x-1,
+ GetPixelIndex(indexes+x));
sync=SyncCacheViewAuthenticPixels(rotate_view,exception);
if (sync == MagickFalse)
status=MagickFalse;
@@ -1551,7 +1551,7 @@
}
SetMagickPixelPacket(image,p,indexes,&source);
MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
- &source,(MagickRealType) GetOpacityPixelComponent(p),area,&destination);
+ &source,(MagickRealType) GetPixelOpacity(p),area,&destination);
SetPixelPacket(image,&destination,q++,shear_indexes++);
SetMagickPixelPacket(image,p++,indexes++,&pixel);
}
@@ -1581,7 +1581,7 @@
continue;
SetMagickPixelPacket(image,p,indexes,&source);
MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
- &source,(MagickRealType) GetOpacityPixelComponent(p),area,&destination);
+ &source,(MagickRealType) GetPixelOpacity(p),area,&destination);
SetPixelPacket(image,&destination,q,shear_indexes);
SetMagickPixelPacket(image,p,indexes,&pixel);
}
@@ -1771,7 +1771,7 @@
}
SetMagickPixelPacket(image,p,indexes,&source);
MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
- &source,(MagickRealType) GetOpacityPixelComponent(p),area,&destination);
+ &source,(MagickRealType) GetPixelOpacity(p),area,&destination);
SetPixelPacket(image,&destination,q++,shear_indexes++);
SetMagickPixelPacket(image,p++,indexes++,&pixel);
}
@@ -1801,7 +1801,7 @@
continue;
SetMagickPixelPacket(image,p,indexes,&source);
MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
- &source,(MagickRealType) GetOpacityPixelComponent(p),area,&destination);
+ &source,(MagickRealType) GetPixelOpacity(p),area,&destination);
SetPixelPacket(image,&destination,q,shear_indexes);
SetMagickPixelPacket(image,p,indexes,&pixel);
}
diff --git a/magick/statistic.c b/magick/statistic.c
index a46fcee..390e659 100644
--- a/magick/statistic.c
+++ b/magick/statistic.c
@@ -555,13 +555,13 @@
}
indexes=GetCacheViewVirtualIndexQueue(image_view);
evaluate_pixel[i].red=ApplyEvaluateOperator(random_info[id],
- GetRedPixelComponent(p),op,evaluate_pixel[i].red);
+ GetPixelRed(p),op,evaluate_pixel[i].red);
evaluate_pixel[i].green=ApplyEvaluateOperator(random_info[id],
- GetGreenPixelComponent(p),op,evaluate_pixel[i].green);
+ GetPixelGreen(p),op,evaluate_pixel[i].green);
evaluate_pixel[i].blue=ApplyEvaluateOperator(random_info[id],
- GetBluePixelComponent(p),op,evaluate_pixel[i].blue);
+ GetPixelBlue(p),op,evaluate_pixel[i].blue);
evaluate_pixel[i].opacity=ApplyEvaluateOperator(random_info[id],
- GetOpacityPixelComponent(p),op,evaluate_pixel[i].opacity);
+ GetPixelOpacity(p),op,evaluate_pixel[i].opacity);
if (evaluate_image->colorspace == CMYKColorspace)
evaluate_pixel[i].index=ApplyEvaluateOperator(random_info[id],
*indexes,op,evaluate_pixel[i].index);
@@ -570,16 +570,16 @@
}
qsort((void *) evaluate_pixel,number_images,sizeof(*evaluate_pixel),
IntensityCompare);
- SetRedPixelComponent(q,ClampToQuantum(evaluate_pixel[i/2].red));
- SetGreenPixelComponent(q,ClampToQuantum(evaluate_pixel[i/2].green));
- SetBluePixelComponent(q,ClampToQuantum(evaluate_pixel[i/2].blue));
+ SetPixelRed(q,ClampToQuantum(evaluate_pixel[i/2].red));
+ SetPixelGreen(q,ClampToQuantum(evaluate_pixel[i/2].green));
+ SetPixelBlue(q,ClampToQuantum(evaluate_pixel[i/2].blue));
if (evaluate_image->matte == MagickFalse)
- SetOpacityPixelComponent(q,ClampToQuantum(
+ SetPixelOpacity(q,ClampToQuantum(
evaluate_pixel[i/2].opacity));
else
- SetAlphaPixelComponent(q,ClampToQuantum(evaluate_pixel[i/2].opacity));
+ SetPixelAlpha(q,ClampToQuantum(evaluate_pixel[i/2].opacity));
if (evaluate_image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(evaluate_indexes+i,ClampToQuantum(
+ SetPixelIndex(evaluate_indexes+i,ClampToQuantum(
evaluate_pixel[i/2].index));
q++;
}
@@ -660,19 +660,19 @@
for (x=0; x < (ssize_t) next->columns; x++)
{
evaluate_pixel[x].red=ApplyEvaluateOperator(random_info[id],
- GetRedPixelComponent(p),i == 0 ? AddEvaluateOperator : op,evaluate_pixel[x].red);
+ GetPixelRed(p),i == 0 ? AddEvaluateOperator : op,evaluate_pixel[x].red);
evaluate_pixel[x].green=ApplyEvaluateOperator(random_info[id],
- GetGreenPixelComponent(p),i == 0 ? AddEvaluateOperator : op,
+ GetPixelGreen(p),i == 0 ? AddEvaluateOperator : op,
evaluate_pixel[x].green);
evaluate_pixel[x].blue=ApplyEvaluateOperator(random_info[id],
- GetBluePixelComponent(p),i == 0 ? AddEvaluateOperator : op,
+ GetPixelBlue(p),i == 0 ? AddEvaluateOperator : op,
evaluate_pixel[x].blue);
evaluate_pixel[x].opacity=ApplyEvaluateOperator(random_info[id],
- GetOpacityPixelComponent(p),i == 0 ? AddEvaluateOperator : op,
+ GetPixelOpacity(p),i == 0 ? AddEvaluateOperator : op,
evaluate_pixel[x].opacity);
if (evaluate_image->colorspace == CMYKColorspace)
evaluate_pixel[x].index=ApplyEvaluateOperator(random_info[id],
- GetIndexPixelComponent(indexes+x),i == 0 ? AddEvaluateOperator :
+ GetPixelIndex(indexes+x),i == 0 ? AddEvaluateOperator :
op,evaluate_pixel[x].index);
p++;
}
@@ -690,15 +690,15 @@
}
for (x=0; x < (ssize_t) evaluate_image->columns; x++)
{
- SetRedPixelComponent(q,ClampToQuantum(evaluate_pixel[x].red));
- SetGreenPixelComponent(q,ClampToQuantum(evaluate_pixel[x].green));
- SetBluePixelComponent(q,ClampToQuantum(evaluate_pixel[x].blue));
+ SetPixelRed(q,ClampToQuantum(evaluate_pixel[x].red));
+ SetPixelGreen(q,ClampToQuantum(evaluate_pixel[x].green));
+ SetPixelBlue(q,ClampToQuantum(evaluate_pixel[x].blue));
if (evaluate_image->matte == MagickFalse)
- SetOpacityPixelComponent(q,ClampToQuantum(evaluate_pixel[x].opacity));
+ SetPixelOpacity(q,ClampToQuantum(evaluate_pixel[x].opacity));
else
- SetAlphaPixelComponent(q,ClampToQuantum(evaluate_pixel[x].opacity));
+ SetPixelAlpha(q,ClampToQuantum(evaluate_pixel[x].opacity));
if (evaluate_image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(evaluate_indexes+x,ClampToQuantum(
+ SetPixelIndex(evaluate_indexes+x,ClampToQuantum(
evaluate_pixel[x].index));
q++;
}
@@ -789,26 +789,26 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToQuantum(ApplyEvaluateOperator(
- random_info[id],GetRedPixelComponent(q),op,value)));
+ SetPixelRed(q,ClampToQuantum(ApplyEvaluateOperator(
+ random_info[id],GetPixelRed(q),op,value)));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToQuantum(ApplyEvaluateOperator(
- random_info[id],GetGreenPixelComponent(q),op,value)));
+ SetPixelGreen(q,ClampToQuantum(ApplyEvaluateOperator(
+ random_info[id],GetPixelGreen(q),op,value)));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToQuantum(ApplyEvaluateOperator(
- random_info[id],GetBluePixelComponent(q),op,value)));
+ SetPixelBlue(q,ClampToQuantum(ApplyEvaluateOperator(
+ random_info[id],GetPixelBlue(q),op,value)));
if ((channel & OpacityChannel) != 0)
{
if (image->matte == MagickFalse)
- SetOpacityPixelComponent(q,ClampToQuantum(ApplyEvaluateOperator(
- random_info[id],GetOpacityPixelComponent(q),op,value)));
+ SetPixelOpacity(q,ClampToQuantum(ApplyEvaluateOperator(
+ random_info[id],GetPixelOpacity(q),op,value)));
else
- SetAlphaPixelComponent(q,ClampToQuantum(ApplyEvaluateOperator(
- random_info[id],(Quantum) GetAlphaPixelComponent(q),op,value)));
+ SetPixelAlpha(q,ClampToQuantum(ApplyEvaluateOperator(
+ random_info[id],(Quantum) GetPixelAlpha(q),op,value)));
}
if (((channel & IndexChannel) != 0) && (indexes != (IndexPacket *) NULL))
- SetIndexPixelComponent(indexes+x,ClampToQuantum(ApplyEvaluateOperator(
- random_info[id],GetIndexPixelComponent(indexes+x),op,value)));
+ SetPixelIndex(indexes+x,ClampToQuantum(ApplyEvaluateOperator(
+ random_info[id],GetPixelIndex(indexes+x),op,value)));
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -1024,27 +1024,27 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ApplyFunction(GetRedPixelComponent(q),
+ SetPixelRed(q,ApplyFunction(GetPixelRed(q),
function,number_parameters,parameters,exception));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ApplyFunction(GetGreenPixelComponent(q),
+ SetPixelGreen(q,ApplyFunction(GetPixelGreen(q),
function,number_parameters,parameters,exception));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ApplyFunction(GetBluePixelComponent(q),
+ SetPixelBlue(q,ApplyFunction(GetPixelBlue(q),
function,number_parameters,parameters,exception));
if ((channel & OpacityChannel) != 0)
{
if (image->matte == MagickFalse)
- SetOpacityPixelComponent(q,ApplyFunction(
- GetOpacityPixelComponent(q),function,number_parameters,parameters,
+ SetPixelOpacity(q,ApplyFunction(
+ GetPixelOpacity(q),function,number_parameters,parameters,
exception));
else
- SetAlphaPixelComponent(q,ApplyFunction((Quantum)
- GetAlphaPixelComponent(q),function,number_parameters,parameters,
+ SetPixelAlpha(q,ApplyFunction((Quantum)
+ GetPixelAlpha(q),function,number_parameters,parameters,
exception));
}
if (((channel & IndexChannel) != 0) && (indexes != (IndexPacket *) NULL))
- SetIndexPixelComponent(indexes+x,ApplyFunction(GetIndexPixelComponent(
+ SetPixelIndex(indexes+x,ApplyFunction(GetPixelIndex(
indexes+x),function,number_parameters,parameters,exception));
q++;
}
@@ -1345,62 +1345,62 @@
{
if ((channel & RedChannel) != 0)
{
- mean+=GetRedPixelComponent(p);
- sum_squares+=(double) GetRedPixelComponent(p)*GetRedPixelComponent(p);
- sum_cubes+=(double) GetRedPixelComponent(p)*GetRedPixelComponent(p)*
- GetRedPixelComponent(p);
- sum_fourth_power+=(double) GetRedPixelComponent(p)*
- GetRedPixelComponent(p)*GetRedPixelComponent(p)*
- GetRedPixelComponent(p);
+ mean+=GetPixelRed(p);
+ sum_squares+=(double) GetPixelRed(p)*GetPixelRed(p);
+ sum_cubes+=(double) GetPixelRed(p)*GetPixelRed(p)*
+ GetPixelRed(p);
+ sum_fourth_power+=(double) GetPixelRed(p)*
+ GetPixelRed(p)*GetPixelRed(p)*
+ GetPixelRed(p);
area++;
}
if ((channel & GreenChannel) != 0)
{
- mean+=GetGreenPixelComponent(p);
- sum_squares+=(double) GetGreenPixelComponent(p)*
- GetGreenPixelComponent(p);
- sum_cubes+=(double) GetGreenPixelComponent(p)*
- GetGreenPixelComponent(p)*GetGreenPixelComponent(p);
- sum_fourth_power+=(double) GetGreenPixelComponent(p)*
- GetGreenPixelComponent(p)*GetGreenPixelComponent(p)*
- GetGreenPixelComponent(p);
+ mean+=GetPixelGreen(p);
+ sum_squares+=(double) GetPixelGreen(p)*
+ GetPixelGreen(p);
+ sum_cubes+=(double) GetPixelGreen(p)*
+ GetPixelGreen(p)*GetPixelGreen(p);
+ sum_fourth_power+=(double) GetPixelGreen(p)*
+ GetPixelGreen(p)*GetPixelGreen(p)*
+ GetPixelGreen(p);
area++;
}
if ((channel & BlueChannel) != 0)
{
- mean+=GetBluePixelComponent(p);
- sum_squares+=(double) GetBluePixelComponent(p)*
- GetBluePixelComponent(p);
- sum_cubes+=(double) GetBluePixelComponent(p)*GetBluePixelComponent(p)*
- GetBluePixelComponent(p);
- sum_fourth_power+=(double) GetBluePixelComponent(p)*
- GetBluePixelComponent(p)*GetBluePixelComponent(p)*
- GetBluePixelComponent(p);
+ mean+=GetPixelBlue(p);
+ sum_squares+=(double) GetPixelBlue(p)*
+ GetPixelBlue(p);
+ sum_cubes+=(double) GetPixelBlue(p)*GetPixelBlue(p)*
+ GetPixelBlue(p);
+ sum_fourth_power+=(double) GetPixelBlue(p)*
+ GetPixelBlue(p)*GetPixelBlue(p)*
+ GetPixelBlue(p);
area++;
}
if ((channel & OpacityChannel) != 0)
{
- mean+=GetOpacityPixelComponent(p);
- sum_squares+=(double) GetOpacityPixelComponent(p)*
- GetOpacityPixelComponent(p);
- sum_cubes+=(double) GetOpacityPixelComponent(p)*
- GetOpacityPixelComponent(p)*GetOpacityPixelComponent(p);
- sum_fourth_power+=(double) GetOpacityPixelComponent(p)*
- GetOpacityPixelComponent(p)*GetOpacityPixelComponent(p)*
- GetOpacityPixelComponent(p);
+ mean+=GetPixelOpacity(p);
+ sum_squares+=(double) GetPixelOpacity(p)*
+ GetPixelOpacity(p);
+ sum_cubes+=(double) GetPixelOpacity(p)*
+ GetPixelOpacity(p)*GetPixelOpacity(p);
+ sum_fourth_power+=(double) GetPixelOpacity(p)*
+ GetPixelOpacity(p)*GetPixelOpacity(p)*
+ GetPixelOpacity(p);
area++;
}
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
{
- mean+=GetIndexPixelComponent(indexes+x);
- sum_squares+=(double) GetIndexPixelComponent(indexes+x)*
- GetIndexPixelComponent(indexes+x);
- sum_cubes+=(double) GetIndexPixelComponent(indexes+x)*
- GetIndexPixelComponent(indexes+x)*GetIndexPixelComponent(indexes+x);
- sum_fourth_power+=(double) GetIndexPixelComponent(indexes+x)*
- GetIndexPixelComponent(indexes+x)*GetIndexPixelComponent(indexes+x)*
- GetIndexPixelComponent(indexes+x);
+ mean+=GetPixelIndex(indexes+x);
+ sum_squares+=(double) GetPixelIndex(indexes+x)*
+ GetPixelIndex(indexes+x);
+ sum_cubes+=(double) GetPixelIndex(indexes+x)*
+ GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x);
+ sum_fourth_power+=(double) GetPixelIndex(indexes+x)*
+ GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x)*
+ GetPixelIndex(indexes+x);
area++;
}
p++;
@@ -1534,10 +1534,10 @@
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
{
- if ((double) GetIndexPixelComponent(indexes+x) < *minima)
- *minima=(double) GetIndexPixelComponent(indexes+x);
- if ((double) GetIndexPixelComponent(indexes+x) > *maxima)
- *maxima=(double) GetIndexPixelComponent(indexes+x);
+ if ((double) GetPixelIndex(indexes+x) < *minima)
+ *minima=(double) GetPixelIndex(indexes+x);
+ if ((double) GetPixelIndex(indexes+x) > *maxima)
+ *maxima=(double) GetPixelIndex(indexes+x);
}
p++;
}
@@ -1642,8 +1642,8 @@
{
depth=channel_statistics[RedChannel].depth;
range=GetQuantumRange(depth);
- status=GetRedPixelComponent(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetRedPixelComponent(p),range),range) ?
+ status=GetPixelRed(p) != ScaleAnyToQuantum(
+ ScaleQuantumToAny(GetPixelRed(p),range),range) ?
MagickTrue : MagickFalse;
if (status != MagickFalse)
{
@@ -1655,8 +1655,8 @@
{
depth=channel_statistics[GreenChannel].depth;
range=GetQuantumRange(depth);
- status=GetGreenPixelComponent(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetGreenPixelComponent(p),range),range) ?
+ status=GetPixelGreen(p) != ScaleAnyToQuantum(
+ ScaleQuantumToAny(GetPixelGreen(p),range),range) ?
MagickTrue : MagickFalse;
if (status != MagickFalse)
{
@@ -1668,8 +1668,8 @@
{
depth=channel_statistics[BlueChannel].depth;
range=GetQuantumRange(depth);
- status=GetBluePixelComponent(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetBluePixelComponent(p),range),range) ?
+ status=GetPixelBlue(p) != ScaleAnyToQuantum(
+ ScaleQuantumToAny(GetPixelBlue(p),range),range) ?
MagickTrue : MagickFalse;
if (status != MagickFalse)
{
@@ -1683,8 +1683,8 @@
{
depth=channel_statistics[OpacityChannel].depth;
range=GetQuantumRange(depth);
- status=GetOpacityPixelComponent(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetOpacityPixelComponent(p),range),range) ?
+ status=GetPixelOpacity(p) != ScaleAnyToQuantum(
+ ScaleQuantumToAny(GetPixelOpacity(p),range),range) ?
MagickTrue : MagickFalse;
if (status != MagickFalse)
{
@@ -1699,8 +1699,8 @@
{
depth=channel_statistics[BlackChannel].depth;
range=GetQuantumRange(depth);
- status=GetIndexPixelComponent(indexes+x) !=
- ScaleAnyToQuantum(ScaleQuantumToAny(GetIndexPixelComponent(
+ status=GetPixelIndex(indexes+x) !=
+ ScaleAnyToQuantum(ScaleQuantumToAny(GetPixelIndex(
indexes+x),range),range) ? MagickTrue : MagickFalse;
if (status != MagickFalse)
{
@@ -1709,85 +1709,85 @@
}
}
}
- if ((double) GetRedPixelComponent(p) < channel_statistics[RedChannel].minima)
- channel_statistics[RedChannel].minima=(double) GetRedPixelComponent(p);
- if ((double) GetRedPixelComponent(p) > channel_statistics[RedChannel].maxima)
- channel_statistics[RedChannel].maxima=(double) GetRedPixelComponent(p);
- channel_statistics[RedChannel].sum+=GetRedPixelComponent(p);
- channel_statistics[RedChannel].sum_squared+=(double) GetRedPixelComponent(p)*
- GetRedPixelComponent(p);
+ if ((double) GetPixelRed(p) < channel_statistics[RedChannel].minima)
+ channel_statistics[RedChannel].minima=(double) GetPixelRed(p);
+ if ((double) GetPixelRed(p) > channel_statistics[RedChannel].maxima)
+ channel_statistics[RedChannel].maxima=(double) GetPixelRed(p);
+ channel_statistics[RedChannel].sum+=GetPixelRed(p);
+ channel_statistics[RedChannel].sum_squared+=(double) GetPixelRed(p)*
+ GetPixelRed(p);
channel_statistics[RedChannel].sum_cubed+=(double)
- GetRedPixelComponent(p)*GetRedPixelComponent(p)*
- GetRedPixelComponent(p);
+ GetPixelRed(p)*GetPixelRed(p)*
+ GetPixelRed(p);
channel_statistics[RedChannel].sum_fourth_power+=(double)
- GetRedPixelComponent(p)*GetRedPixelComponent(p)*
- GetRedPixelComponent(p)*GetRedPixelComponent(p);
- if ((double) GetGreenPixelComponent(p) < channel_statistics[GreenChannel].minima)
+ GetPixelRed(p)*GetPixelRed(p)*
+ GetPixelRed(p)*GetPixelRed(p);
+ if ((double) GetPixelGreen(p) < channel_statistics[GreenChannel].minima)
channel_statistics[GreenChannel].minima=(double)
- GetGreenPixelComponent(p);
- if ((double) GetGreenPixelComponent(p) > channel_statistics[GreenChannel].maxima)
+ GetPixelGreen(p);
+ if ((double) GetPixelGreen(p) > channel_statistics[GreenChannel].maxima)
channel_statistics[GreenChannel].maxima=(double)
- GetGreenPixelComponent(p);
- channel_statistics[GreenChannel].sum+=GetGreenPixelComponent(p);
+ GetPixelGreen(p);
+ channel_statistics[GreenChannel].sum+=GetPixelGreen(p);
channel_statistics[GreenChannel].sum_squared+=(double)
- GetGreenPixelComponent(p)*GetGreenPixelComponent(p);
+ GetPixelGreen(p)*GetPixelGreen(p);
channel_statistics[GreenChannel].sum_cubed+=(double)
- GetGreenPixelComponent(p)*GetGreenPixelComponent(p)*
- GetGreenPixelComponent(p);
+ GetPixelGreen(p)*GetPixelGreen(p)*
+ GetPixelGreen(p);
channel_statistics[GreenChannel].sum_fourth_power+=(double)
- GetGreenPixelComponent(p)*GetGreenPixelComponent(p)*
- GetGreenPixelComponent(p)*GetGreenPixelComponent(p);
- if ((double) GetBluePixelComponent(p) < channel_statistics[BlueChannel].minima)
+ GetPixelGreen(p)*GetPixelGreen(p)*
+ GetPixelGreen(p)*GetPixelGreen(p);
+ if ((double) GetPixelBlue(p) < channel_statistics[BlueChannel].minima)
channel_statistics[BlueChannel].minima=(double)
- GetBluePixelComponent(p);
- if ((double) GetBluePixelComponent(p) > channel_statistics[BlueChannel].maxima)
+ GetPixelBlue(p);
+ if ((double) GetPixelBlue(p) > channel_statistics[BlueChannel].maxima)
channel_statistics[BlueChannel].maxima=(double)
- GetBluePixelComponent(p);
- channel_statistics[BlueChannel].sum+=GetBluePixelComponent(p);
+ GetPixelBlue(p);
+ channel_statistics[BlueChannel].sum+=GetPixelBlue(p);
channel_statistics[BlueChannel].sum_squared+=(double)
- GetBluePixelComponent(p)*GetBluePixelComponent(p);
+ GetPixelBlue(p)*GetPixelBlue(p);
channel_statistics[BlueChannel].sum_cubed+=(double)
- GetBluePixelComponent(p)*GetBluePixelComponent(p)*
- GetBluePixelComponent(p);
+ GetPixelBlue(p)*GetPixelBlue(p)*
+ GetPixelBlue(p);
channel_statistics[BlueChannel].sum_fourth_power+=(double)
- GetBluePixelComponent(p)*GetBluePixelComponent(p)*
- GetBluePixelComponent(p)*GetBluePixelComponent(p);
+ GetPixelBlue(p)*GetPixelBlue(p)*
+ GetPixelBlue(p)*GetPixelBlue(p);
if (image->matte != MagickFalse)
{
- if ((double) GetOpacityPixelComponent(p) < channel_statistics[OpacityChannel].minima)
+ if ((double) GetPixelOpacity(p) < channel_statistics[OpacityChannel].minima)
channel_statistics[OpacityChannel].minima=(double)
- GetOpacityPixelComponent(p);
- if ((double) GetOpacityPixelComponent(p) > channel_statistics[OpacityChannel].maxima)
+ GetPixelOpacity(p);
+ if ((double) GetPixelOpacity(p) > channel_statistics[OpacityChannel].maxima)
channel_statistics[OpacityChannel].maxima=(double)
- GetOpacityPixelComponent(p);
- channel_statistics[OpacityChannel].sum+=GetOpacityPixelComponent(p);
+ GetPixelOpacity(p);
+ channel_statistics[OpacityChannel].sum+=GetPixelOpacity(p);
channel_statistics[OpacityChannel].sum_squared+=(double)
- GetOpacityPixelComponent(p)*GetOpacityPixelComponent(p);
+ GetPixelOpacity(p)*GetPixelOpacity(p);
channel_statistics[OpacityChannel].sum_cubed+=(double)
- GetOpacityPixelComponent(p)*GetOpacityPixelComponent(p)*
- GetOpacityPixelComponent(p);
+ GetPixelOpacity(p)*GetPixelOpacity(p)*
+ GetPixelOpacity(p);
channel_statistics[OpacityChannel].sum_fourth_power+=(double)
- GetOpacityPixelComponent(p)*GetOpacityPixelComponent(p)*
- GetOpacityPixelComponent(p)*GetOpacityPixelComponent(p);
+ GetPixelOpacity(p)*GetPixelOpacity(p)*
+ GetPixelOpacity(p)*GetPixelOpacity(p);
}
if (image->colorspace == CMYKColorspace)
{
- if ((double) GetIndexPixelComponent(indexes+x) < channel_statistics[BlackChannel].minima)
+ if ((double) GetPixelIndex(indexes+x) < channel_statistics[BlackChannel].minima)
channel_statistics[BlackChannel].minima=(double)
- GetIndexPixelComponent(indexes+x);
- if ((double) GetIndexPixelComponent(indexes+x) > channel_statistics[BlackChannel].maxima)
+ GetPixelIndex(indexes+x);
+ if ((double) GetPixelIndex(indexes+x) > channel_statistics[BlackChannel].maxima)
channel_statistics[BlackChannel].maxima=(double)
- GetIndexPixelComponent(indexes+x);
+ GetPixelIndex(indexes+x);
channel_statistics[BlackChannel].sum+=
- GetIndexPixelComponent(indexes+x);
+ GetPixelIndex(indexes+x);
channel_statistics[BlackChannel].sum_squared+=(double)
- GetIndexPixelComponent(indexes+x)*GetIndexPixelComponent(indexes+x);
+ GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x);
channel_statistics[BlackChannel].sum_cubed+=(double)
- GetIndexPixelComponent(indexes+x)*GetIndexPixelComponent(indexes+x)*
- GetIndexPixelComponent(indexes+x);
+ GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x)*
+ GetPixelIndex(indexes+x);
channel_statistics[BlackChannel].sum_fourth_power+=(double)
- GetIndexPixelComponent(indexes+x)*GetIndexPixelComponent(indexes+x)*
- GetIndexPixelComponent(indexes+x)*GetIndexPixelComponent(indexes+x);
+ GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x)*
+ GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x);
}
x++;
p++;
diff --git a/magick/stream.c b/magick/stream.c
index e7a6f9b..28d4c8d 100644
--- a/magick/stream.c
+++ b/magick/stream.c
@@ -1390,9 +1390,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
- *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(p));
p++;
}
break;
@@ -1404,10 +1404,10 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
- *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
- *q++=ScaleQuantumToChar((Quantum) (GetAlphaPixelComponent(p)));
+ *q++=ScaleQuantumToChar(GetPixelBlue(p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(p));
+ *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
p++;
}
break;
@@ -1419,9 +1419,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
- *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(p));
*q++=ScaleQuantumToChar((Quantum) 0);
p++;
}
@@ -1446,9 +1446,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
- *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(p));
p++;
}
break;
@@ -1460,10 +1460,10 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
- *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
- *q++=ScaleQuantumToChar((Quantum) (GetAlphaPixelComponent(p)));
+ *q++=ScaleQuantumToChar(GetPixelRed(p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(p));
+ *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
p++;
}
break;
@@ -1475,9 +1475,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToChar(GetRedPixelComponent(p));
- *q++=ScaleQuantumToChar(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToChar(GetBluePixelComponent(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(p));
*q++=ScaleQuantumToChar((Quantum) 0);
p++;
}
@@ -1497,35 +1497,35 @@
case RedQuantum:
case CyanQuantum:
{
- *q=ScaleQuantumToChar(GetRedPixelComponent(p));
+ *q=ScaleQuantumToChar(GetPixelRed(p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=ScaleQuantumToChar(GetGreenPixelComponent(p));
+ *q=ScaleQuantumToChar(GetPixelGreen(p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=ScaleQuantumToChar(GetBluePixelComponent(p));
+ *q=ScaleQuantumToChar(GetPixelBlue(p));
break;
}
case AlphaQuantum:
{
- *q=ScaleQuantumToChar((Quantum) (GetAlphaPixelComponent(p)));
+ *q=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
break;
}
case OpacityQuantum:
{
- *q=ScaleQuantumToChar(GetOpacityPixelComponent(p));
+ *q=ScaleQuantumToChar(GetPixelOpacity(p));
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=ScaleQuantumToChar(GetIndexPixelComponent(indexes+x));
+ *q=ScaleQuantumToChar(GetPixelIndex(indexes+x));
break;
}
case IndexQuantum:
@@ -1555,11 +1555,11 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(double) ((QuantumScale*GetBluePixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelBlue(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetGreenPixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelGreen(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetRedPixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelRed(p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1572,13 +1572,13 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(double) ((QuantumScale*GetBluePixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelBlue(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetGreenPixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelGreen(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetRedPixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelRed(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetAlphaPixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelAlpha(p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1591,11 +1591,11 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(double) ((QuantumScale*GetBluePixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelBlue(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetGreenPixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelGreen(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetRedPixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelRed(p))*
quantum_info->scale+quantum_info->minimum);
*q++=0.0;
p++;
@@ -1622,11 +1622,11 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(double) ((QuantumScale*GetRedPixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelRed(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetGreenPixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelGreen(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetBluePixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelBlue(p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1639,13 +1639,13 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(double) ((QuantumScale*GetRedPixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelRed(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetGreenPixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelGreen(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetBluePixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelBlue(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetAlphaPixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelAlpha(p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1658,11 +1658,11 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(double) ((QuantumScale*GetRedPixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelRed(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetGreenPixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelGreen(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetBluePixelComponent(p))*
+ *q++=(double) ((QuantumScale*GetPixelBlue(p))*
quantum_info->scale+quantum_info->minimum);
*q++=0.0;
p++;
@@ -1683,40 +1683,40 @@
case RedQuantum:
case CyanQuantum:
{
- *q=(double) ((QuantumScale*GetRedPixelComponent(p))*
+ *q=(double) ((QuantumScale*GetPixelRed(p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=(double) ((QuantumScale*GetGreenPixelComponent(p))*
+ *q=(double) ((QuantumScale*GetPixelGreen(p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=(double) ((QuantumScale*GetBluePixelComponent(p))*
+ *q=(double) ((QuantumScale*GetPixelBlue(p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case AlphaQuantum:
{
- *q=(double) ((QuantumScale*GetAlphaPixelComponent(p))*
+ *q=(double) ((QuantumScale*GetPixelAlpha(p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case OpacityQuantum:
{
- *q=(double) ((QuantumScale*GetOpacityPixelComponent(p))*
+ *q=(double) ((QuantumScale*GetPixelOpacity(p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=(double) ((QuantumScale*GetIndexPixelComponent(indexes+x))*
+ *q=(double) ((QuantumScale*GetPixelIndex(indexes+x))*
quantum_info->scale+quantum_info->minimum);
break;
}
@@ -1748,11 +1748,11 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(float) ((QuantumScale*GetBluePixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelBlue(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetGreenPixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelGreen(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetRedPixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelRed(p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1765,13 +1765,13 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(float) ((QuantumScale*GetBluePixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelBlue(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetGreenPixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelGreen(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetRedPixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelRed(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*(Quantum) (GetAlphaPixelComponent(p)))*
+ *q++=(float) ((QuantumScale*(Quantum) (GetPixelAlpha(p)))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1784,11 +1784,11 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(float) ((QuantumScale*GetBluePixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelBlue(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetGreenPixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelGreen(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetRedPixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelRed(p))*
quantum_info->scale+quantum_info->minimum);
*q++=0.0;
p++;
@@ -1815,11 +1815,11 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(float) ((QuantumScale*GetRedPixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelRed(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetGreenPixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelGreen(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetBluePixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelBlue(p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1832,13 +1832,13 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(float) ((QuantumScale*GetRedPixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelRed(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetGreenPixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelGreen(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetBluePixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelBlue(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetAlphaPixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelAlpha(p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1851,11 +1851,11 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(float) ((QuantumScale*GetRedPixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelRed(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetGreenPixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelGreen(p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetBluePixelComponent(p))*
+ *q++=(float) ((QuantumScale*GetPixelBlue(p))*
quantum_info->scale+quantum_info->minimum);
*q++=0.0;
p++;
@@ -1876,40 +1876,40 @@
case RedQuantum:
case CyanQuantum:
{
- *q=(float) ((QuantumScale*GetRedPixelComponent(p))*
+ *q=(float) ((QuantumScale*GetPixelRed(p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=(float) ((QuantumScale*GetGreenPixelComponent(p))*
+ *q=(float) ((QuantumScale*GetPixelGreen(p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=(float) ((QuantumScale*GetBluePixelComponent(p))*
+ *q=(float) ((QuantumScale*GetPixelBlue(p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case AlphaQuantum:
{
- *q=(float) ((QuantumScale*GetAlphaPixelComponent(p))*
+ *q=(float) ((QuantumScale*GetPixelAlpha(p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case OpacityQuantum:
{
- *q=(float) ((QuantumScale*GetOpacityPixelComponent(p))*
+ *q=(float) ((QuantumScale*GetPixelOpacity(p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=(float) ((QuantumScale*GetIndexPixelComponent(indexes+x))*
+ *q=(float) ((QuantumScale*GetPixelIndex(indexes+x))*
quantum_info->scale+quantum_info->minimum);
break;
}
@@ -1941,9 +1941,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
p++;
}
break;
@@ -1955,11 +1955,11 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
*q++=(unsigned int) ScaleQuantumToLong((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
p++;
}
break;
@@ -1971,9 +1971,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
*q++=0U;
p++;
}
@@ -1999,9 +1999,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
p++;
}
break;
@@ -2013,11 +2013,11 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
*q++=(unsigned int) ScaleQuantumToLong((Quantum)
- (GetAlphaPixelComponent(p)));
+ (GetPixelAlpha(p)));
p++;
}
break;
@@ -2029,9 +2029,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
*q++=0U;
p++;
}
@@ -2051,36 +2051,36 @@
case RedQuantum:
case CyanQuantum:
{
- *q=(unsigned int) ScaleQuantumToLong(GetRedPixelComponent(p));
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=(unsigned int) ScaleQuantumToLong(GetGreenPixelComponent(p));
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=(unsigned int) ScaleQuantumToLong(GetBluePixelComponent(p));
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
break;
}
case AlphaQuantum:
{
*q=(unsigned int) ScaleQuantumToLong((Quantum) (QuantumRange-
- GetOpacityPixelComponent(p)));
+ GetPixelOpacity(p)));
break;
}
case OpacityQuantum:
{
- *q=(unsigned int) ScaleQuantumToLong(GetOpacityPixelComponent(p));
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelOpacity(p));
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=(unsigned int) ScaleQuantumToLong(GetIndexPixelComponent(
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelIndex(
indexes+x));
break;
}
@@ -2112,9 +2112,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
- *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=ScaleQuantumToLong(GetPixelRed(p));
p++;
}
break;
@@ -2126,10 +2126,10 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
- *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
- *q++=ScaleQuantumToLong((Quantum) (GetAlphaPixelComponent(p)));
+ *q++=ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=ScaleQuantumToLong(GetPixelRed(p));
+ *q++=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
p++;
}
break;
@@ -2141,9 +2141,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
- *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=ScaleQuantumToLong(GetPixelRed(p));
*q++=0;
p++;
}
@@ -2168,9 +2168,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
- *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
+ *q++=ScaleQuantumToLong(GetPixelRed(p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(p));
p++;
}
break;
@@ -2182,10 +2182,10 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
- *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
- *q++=ScaleQuantumToLong((Quantum) (GetAlphaPixelComponent(p)));
+ *q++=ScaleQuantumToLong(GetPixelRed(p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
p++;
}
break;
@@ -2197,9 +2197,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToLong(GetRedPixelComponent(p));
- *q++=ScaleQuantumToLong(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToLong(GetBluePixelComponent(p));
+ *q++=ScaleQuantumToLong(GetPixelRed(p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(p));
*q++=0;
p++;
}
@@ -2219,35 +2219,35 @@
case RedQuantum:
case CyanQuantum:
{
- *q=ScaleQuantumToLong(GetRedPixelComponent(p));
+ *q=ScaleQuantumToLong(GetPixelRed(p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=ScaleQuantumToLong(GetGreenPixelComponent(p));
+ *q=ScaleQuantumToLong(GetPixelGreen(p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=ScaleQuantumToLong(GetBluePixelComponent(p));
+ *q=ScaleQuantumToLong(GetPixelBlue(p));
break;
}
case AlphaQuantum:
{
- *q=ScaleQuantumToLong((Quantum) (GetAlphaPixelComponent(p)));
+ *q=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
break;
}
case OpacityQuantum:
{
- *q=ScaleQuantumToLong(GetOpacityPixelComponent(p));
+ *q=ScaleQuantumToLong(GetPixelOpacity(p));
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=ScaleQuantumToLong(GetIndexPixelComponent(indexes+x));
+ *q=ScaleQuantumToLong(GetPixelIndex(indexes+x));
break;
}
case IndexQuantum:
@@ -2277,9 +2277,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=GetBluePixelComponent(p);
- *q++=GetGreenPixelComponent(p);
- *q++=GetRedPixelComponent(p);
+ *q++=GetPixelBlue(p);
+ *q++=GetPixelGreen(p);
+ *q++=GetPixelRed(p);
p++;
}
break;
@@ -2291,10 +2291,10 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=GetBluePixelComponent(p);
- *q++=GetGreenPixelComponent(p);
- *q++=GetRedPixelComponent(p);
- *q++=(Quantum) (GetAlphaPixelComponent(p));
+ *q++=GetPixelBlue(p);
+ *q++=GetPixelGreen(p);
+ *q++=GetPixelRed(p);
+ *q++=(Quantum) (GetPixelAlpha(p));
p++;
}
break;
@@ -2306,9 +2306,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=GetBluePixelComponent(p);
- *q++=GetGreenPixelComponent(p);
- *q++=GetRedPixelComponent(p);
+ *q++=GetPixelBlue(p);
+ *q++=GetPixelGreen(p);
+ *q++=GetPixelRed(p);
*q++=0;
p++;
}
@@ -2333,9 +2333,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=GetRedPixelComponent(p);
- *q++=GetGreenPixelComponent(p);
- *q++=GetBluePixelComponent(p);
+ *q++=GetPixelRed(p);
+ *q++=GetPixelGreen(p);
+ *q++=GetPixelBlue(p);
p++;
}
break;
@@ -2347,10 +2347,10 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=GetRedPixelComponent(p);
- *q++=GetGreenPixelComponent(p);
- *q++=GetBluePixelComponent(p);
- *q++=(Quantum) (GetAlphaPixelComponent(p));
+ *q++=GetPixelRed(p);
+ *q++=GetPixelGreen(p);
+ *q++=GetPixelBlue(p);
+ *q++=(Quantum) (GetPixelAlpha(p));
p++;
}
break;
@@ -2362,9 +2362,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=GetRedPixelComponent(p);
- *q++=GetGreenPixelComponent(p);
- *q++=GetBluePixelComponent(p);
+ *q++=GetPixelRed(p);
+ *q++=GetPixelGreen(p);
+ *q++=GetPixelBlue(p);
*q++=0U;
p++;
}
@@ -2384,35 +2384,35 @@
case RedQuantum:
case CyanQuantum:
{
- *q=GetRedPixelComponent(p);
+ *q=GetPixelRed(p);
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=GetGreenPixelComponent(p);
+ *q=GetPixelGreen(p);
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=GetBluePixelComponent(p);
+ *q=GetPixelBlue(p);
break;
}
case AlphaQuantum:
{
- *q=(Quantum) (GetAlphaPixelComponent(p));
+ *q=(Quantum) (GetPixelAlpha(p));
break;
}
case OpacityQuantum:
{
- *q=GetOpacityPixelComponent(p);
+ *q=GetPixelOpacity(p);
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=GetIndexPixelComponent(indexes+x);
+ *q=GetPixelIndex(indexes+x);
break;
}
case IndexQuantum:
@@ -2442,9 +2442,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
- *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(p));
+ *q++=ScaleQuantumToShort(GetPixelRed(p));
p++;
}
break;
@@ -2456,10 +2456,10 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
- *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
- *q++=ScaleQuantumToShort((Quantum) (GetAlphaPixelComponent(p)));
+ *q++=ScaleQuantumToShort(GetPixelBlue(p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(p));
+ *q++=ScaleQuantumToShort(GetPixelRed(p));
+ *q++=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
p++;
}
break;
@@ -2471,9 +2471,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
- *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(p));
+ *q++=ScaleQuantumToShort(GetPixelRed(p));
*q++=0;
p++;
}
@@ -2498,9 +2498,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
- *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
+ *q++=ScaleQuantumToShort(GetPixelRed(p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(p));
p++;
}
break;
@@ -2512,10 +2512,10 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
- *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
- *q++=ScaleQuantumToShort((Quantum) (GetAlphaPixelComponent(p)));
+ *q++=ScaleQuantumToShort(GetPixelRed(p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(p));
+ *q++=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
p++;
}
break;
@@ -2527,9 +2527,9 @@
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToShort(GetRedPixelComponent(p));
- *q++=ScaleQuantumToShort(GetGreenPixelComponent(p));
- *q++=ScaleQuantumToShort(GetBluePixelComponent(p));
+ *q++=ScaleQuantumToShort(GetPixelRed(p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(p));
*q++=0;
p++;
}
@@ -2549,35 +2549,35 @@
case RedQuantum:
case CyanQuantum:
{
- *q=ScaleQuantumToShort(GetRedPixelComponent(p));
+ *q=ScaleQuantumToShort(GetPixelRed(p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=ScaleQuantumToShort(GetGreenPixelComponent(p));
+ *q=ScaleQuantumToShort(GetPixelGreen(p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=ScaleQuantumToShort(GetBluePixelComponent(p));
+ *q=ScaleQuantumToShort(GetPixelBlue(p));
break;
}
case AlphaQuantum:
{
- *q=ScaleQuantumToShort((Quantum) (GetAlphaPixelComponent(p)));
+ *q=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
break;
}
case OpacityQuantum:
{
- *q=ScaleQuantumToShort(GetOpacityPixelComponent(p));
+ *q=ScaleQuantumToShort(GetPixelOpacity(p));
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=ScaleQuantumToShort(GetIndexPixelComponent(indexes+x));
+ *q=ScaleQuantumToShort(GetPixelIndex(indexes+x));
break;
}
case IndexQuantum:
diff --git a/magick/threshold.c b/magick/threshold.c
index 532ed1d..c2bd371 100644
--- a/magick/threshold.c
+++ b/magick/threshold.c
@@ -257,7 +257,7 @@
pixel.blue+=r[u].blue;
pixel.opacity+=r[u].opacity;
if (image->colorspace == CMYKColorspace)
- pixel.index=(MagickRealType) GetIndexPixelComponent(
+ pixel.index=(MagickRealType) GetPixelIndex(
indexes+x+(r-p)+u);
}
r+=image->columns+width;
@@ -268,17 +268,17 @@
mean.opacity=(MagickRealType) (pixel.opacity/number_pixels+offset);
if (image->colorspace == CMYKColorspace)
mean.index=(MagickRealType) (pixel.index/number_pixels+offset);
- SetRedPixelComponent(q,((MagickRealType) GetRedPixelComponent(q) <=
+ SetPixelRed(q,((MagickRealType) GetPixelRed(q) <=
mean.red) ? 0 : QuantumRange);
- SetGreenPixelComponent(q,((MagickRealType) GetGreenPixelComponent(q) <=
+ SetPixelGreen(q,((MagickRealType) GetPixelGreen(q) <=
mean.green) ? 0 : QuantumRange);
- SetBluePixelComponent(q,((MagickRealType) GetBluePixelComponent(q) <=
+ SetPixelBlue(q,((MagickRealType) GetPixelBlue(q) <=
mean.blue) ? 0 : QuantumRange);
- SetOpacityPixelComponent(q,((MagickRealType) GetOpacityPixelComponent(q)
+ SetPixelOpacity(q,((MagickRealType) GetPixelOpacity(q)
<= mean.opacity) ? 0 : QuantumRange);
if (image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(threshold_indexes+x,(((MagickRealType)
- GetIndexPixelComponent(threshold_indexes+x) <= mean.index) ? 0 :
+ SetPixelIndex(threshold_indexes+x,(((MagickRealType)
+ GetPixelIndex(threshold_indexes+x) <= mean.index) ? 0 :
QuantumRange));
p++;
q++;
@@ -419,10 +419,10 @@
{
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetRedPixelComponent(q,(MagickRealType) PixelIntensityToQuantum(q) <=
+ SetPixelRed(q,(MagickRealType) PixelIntensityToQuantum(q) <=
threshold ? 0 : QuantumRange);
- SetGreenPixelComponent(q,GetRedPixelComponent(q));
- SetBluePixelComponent(q,GetRedPixelComponent(q));
+ SetPixelGreen(q,GetPixelRed(q));
+ SetPixelBlue(q,GetPixelRed(q));
q++;
}
}
@@ -430,28 +430,28 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,(MagickRealType) GetRedPixelComponent(q) <=
+ SetPixelRed(q,(MagickRealType) GetPixelRed(q) <=
threshold ? 0 : QuantumRange);
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,(MagickRealType) GetGreenPixelComponent(q) <=
+ SetPixelGreen(q,(MagickRealType) GetPixelGreen(q) <=
threshold ? 0 : QuantumRange);
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,(MagickRealType) GetBluePixelComponent(q) <=
+ SetPixelBlue(q,(MagickRealType) GetPixelBlue(q) <=
threshold ? 0 : QuantumRange);
if ((channel & OpacityChannel) != 0)
{
if (image->matte == MagickFalse)
- SetOpacityPixelComponent(q,(MagickRealType)
- GetOpacityPixelComponent(q) <= threshold ? 0 : QuantumRange);
+ SetPixelOpacity(q,(MagickRealType)
+ GetPixelOpacity(q) <= threshold ? 0 : QuantumRange);
else
- SetOpacityPixelComponent(q,(MagickRealType)
- GetOpacityPixelComponent(q) <= threshold ? OpaqueOpacity :
+ SetPixelOpacity(q,(MagickRealType)
+ GetPixelOpacity(q) <= threshold ? OpaqueOpacity :
TransparentOpacity);
}
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(indexes+x,(MagickRealType)
- GetIndexPixelComponent(indexes+x) <= threshold ? 0 : QuantumRange);
+ SetPixelIndex(indexes+x,(MagickRealType)
+ GetPixelIndex(indexes+x) <= threshold ? 0 : QuantumRange);
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -610,32 +610,32 @@
{
if (PixelIntensity(q) < MagickPixelIntensity(&threshold))
{
- SetRedPixelComponent(q,0);
- SetGreenPixelComponent(q,0);
- SetBluePixelComponent(q,0);
+ SetPixelRed(q,0);
+ SetPixelGreen(q,0);
+ SetPixelBlue(q,0);
if (image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(indexes+x,0);
+ SetPixelIndex(indexes+x,0);
}
}
else
{
if (((channel & RedChannel) != 0) &&
- ((MagickRealType) GetRedPixelComponent(q) < threshold.red))
- SetRedPixelComponent(q,0);
+ ((MagickRealType) GetPixelRed(q) < threshold.red))
+ SetPixelRed(q,0);
if (((channel & GreenChannel) != 0) &&
- ((MagickRealType) GetGreenPixelComponent(q) < threshold.green))
- SetGreenPixelComponent(q,0);
+ ((MagickRealType) GetPixelGreen(q) < threshold.green))
+ SetPixelGreen(q,0);
if (((channel & BlueChannel) != 0) &&
- ((MagickRealType) GetBluePixelComponent(q) < threshold.blue))
- SetBluePixelComponent(q,0);
+ ((MagickRealType) GetPixelBlue(q) < threshold.blue))
+ SetPixelBlue(q,0);
if (((channel & OpacityChannel) != 0) &&
- ((MagickRealType) GetOpacityPixelComponent(q) < threshold.opacity))
- SetOpacityPixelComponent(q,0);
+ ((MagickRealType) GetPixelOpacity(q) < threshold.opacity))
+ SetPixelOpacity(q,0);
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace) &&
- ((MagickRealType) GetIndexPixelComponent(indexes+x) <
+ ((MagickRealType) GetPixelIndex(indexes+x) <
threshold.index))
- SetIndexPixelComponent(indexes+x,0);
+ SetPixelIndex(indexes+x,0);
}
q++;
}
@@ -743,14 +743,14 @@
q=image->colormap;
for (i=0; i < (ssize_t) image->colors; i++)
{
- SetRedPixelComponent(q,ClampToUnsignedQuantum(
- GetRedPixelComponent(q)));
- SetGreenPixelComponent(q,ClampToUnsignedQuantum(
- GetGreenPixelComponent(q)));
- SetBluePixelComponent(q,ClampToUnsignedQuantum(
- GetBluePixelComponent(q)));
- SetOpacityPixelComponent(q,ClampToUnsignedQuantum(
- GetOpacityPixelComponent(q)));
+ SetPixelRed(q,ClampToUnsignedQuantum(
+ GetPixelRed(q)));
+ SetPixelGreen(q,ClampToUnsignedQuantum(
+ GetPixelGreen(q)));
+ SetPixelBlue(q,ClampToUnsignedQuantum(
+ GetPixelBlue(q)));
+ SetPixelOpacity(q,ClampToUnsignedQuantum(
+ GetPixelOpacity(q)));
q++;
}
return(SyncImage(image));
@@ -788,21 +788,21 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,ClampToUnsignedQuantum(
- GetRedPixelComponent(q)));
+ SetPixelRed(q,ClampToUnsignedQuantum(
+ GetPixelRed(q)));
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,ClampToUnsignedQuantum(
- GetGreenPixelComponent(q)));
+ SetPixelGreen(q,ClampToUnsignedQuantum(
+ GetPixelGreen(q)));
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,ClampToUnsignedQuantum(
- GetBluePixelComponent(q)));
+ SetPixelBlue(q,ClampToUnsignedQuantum(
+ GetPixelBlue(q)));
if ((channel & OpacityChannel) != 0)
- SetOpacityPixelComponent(q,ClampToUnsignedQuantum(
- GetOpacityPixelComponent(q)));
+ SetPixelOpacity(q,ClampToUnsignedQuantum(
+ GetPixelOpacity(q)));
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(indexes+x,ClampToUnsignedQuantum(
- GetIndexPixelComponent(indexes+x)));
+ SetPixelIndex(indexes+x,ClampToUnsignedQuantum(
+ GetPixelIndex(indexes+x)));
q++;
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -1550,38 +1550,38 @@
Opacity is inverted so 'off' represents transparent.
*/
if (levels.red) {
- t = (ssize_t) (QuantumScale*GetRedPixelComponent(q)*(levels.red*d+1));
+ t = (ssize_t) (QuantumScale*GetPixelRed(q)*(levels.red*d+1));
l = t/d; t = t-l*d;
- SetRedPixelComponent(q,RoundToQuantum((MagickRealType)
+ SetPixelRed(q,RoundToQuantum((MagickRealType)
((l+(t >= threshold))*(MagickRealType) QuantumRange/levels.red)));
}
if (levels.green) {
- t = (ssize_t) (QuantumScale*GetGreenPixelComponent(q)*
+ t = (ssize_t) (QuantumScale*GetPixelGreen(q)*
(levels.green*d+1));
l = t/d; t = t-l*d;
- SetGreenPixelComponent(q,RoundToQuantum((MagickRealType)
+ SetPixelGreen(q,RoundToQuantum((MagickRealType)
((l+(t >= threshold))*(MagickRealType) QuantumRange/levels.green)));
}
if (levels.blue) {
- t = (ssize_t) (QuantumScale*GetBluePixelComponent(q)*
+ t = (ssize_t) (QuantumScale*GetPixelBlue(q)*
(levels.blue*d+1));
l = t/d; t = t-l*d;
- SetBluePixelComponent(q,RoundToQuantum((MagickRealType)
+ SetPixelBlue(q,RoundToQuantum((MagickRealType)
((l+(t >= threshold))*(MagickRealType) QuantumRange/levels.blue)));
}
if (levels.opacity) {
- t = (ssize_t) ((1.0-QuantumScale*GetOpacityPixelComponent(q))*
+ t = (ssize_t) ((1.0-QuantumScale*GetPixelOpacity(q))*
(levels.opacity*d+1));
l = t/d; t = t-l*d;
- SetOpacityPixelComponent(q,RoundToQuantum((MagickRealType)
+ SetPixelOpacity(q,RoundToQuantum((MagickRealType)
((1.0-l-(t >= threshold))*(MagickRealType) QuantumRange/
levels.opacity)));
}
if (levels.index) {
- t = (ssize_t) (QuantumScale*GetIndexPixelComponent(indexes+x)*
+ t = (ssize_t) (QuantumScale*GetPixelIndex(indexes+x)*
(levels.index*d+1));
l = t/d; t = t-l*d;
- SetIndexPixelComponent(indexes+x,RoundToQuantum((MagickRealType) ((l+
+ SetPixelIndex(indexes+x,RoundToQuantum((MagickRealType) ((l+
(t>=threshold))*(MagickRealType) QuantumRange/levels.index)));
}
q++;
@@ -1778,8 +1778,8 @@
threshold.index=(MagickRealType)(QuantumRange*
GetPseudoRandomValue(random_info[id]));
index=(IndexPacket) (intensity <= threshold.index ? 0 : 1);
- SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+ SetPixelIndex(indexes+x,index);
+ SetPixelRGBO(q,image->colormap+(ssize_t) index);
q++;
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1840,10 +1840,10 @@
{
if ((channel & RedChannel) != 0)
{
- if ((MagickRealType) GetRedPixelComponent(q) < min_threshold)
+ if ((MagickRealType) GetPixelRed(q) < min_threshold)
threshold.red=min_threshold;
else
- if ((MagickRealType) GetRedPixelComponent(q) > max_threshold)
+ if ((MagickRealType) GetPixelRed(q) > max_threshold)
threshold.red=max_threshold;
else
threshold.red=(MagickRealType) (QuantumRange*
@@ -1851,10 +1851,10 @@
}
if ((channel & GreenChannel) != 0)
{
- if ((MagickRealType) GetGreenPixelComponent(q) < min_threshold)
+ if ((MagickRealType) GetPixelGreen(q) < min_threshold)
threshold.green=min_threshold;
else
- if ((MagickRealType) GetGreenPixelComponent(q) > max_threshold)
+ if ((MagickRealType) GetPixelGreen(q) > max_threshold)
threshold.green=max_threshold;
else
threshold.green=(MagickRealType) (QuantumRange*
@@ -1862,10 +1862,10 @@
}
if ((channel & BlueChannel) != 0)
{
- if ((MagickRealType) GetBluePixelComponent(q) < min_threshold)
+ if ((MagickRealType) GetPixelBlue(q) < min_threshold)
threshold.blue=min_threshold;
else
- if ((MagickRealType) GetBluePixelComponent(q) > max_threshold)
+ if ((MagickRealType) GetPixelBlue(q) > max_threshold)
threshold.blue=max_threshold;
else
threshold.blue=(MagickRealType) (QuantumRange*
@@ -1873,10 +1873,10 @@
}
if ((channel & OpacityChannel) != 0)
{
- if ((MagickRealType) GetOpacityPixelComponent(q) < min_threshold)
+ if ((MagickRealType) GetPixelOpacity(q) < min_threshold)
threshold.opacity=min_threshold;
else
- if ((MagickRealType) GetOpacityPixelComponent(q) > max_threshold)
+ if ((MagickRealType) GetPixelOpacity(q) > max_threshold)
threshold.opacity=max_threshold;
else
threshold.opacity=(MagickRealType) (QuantumRange*
@@ -1885,31 +1885,31 @@
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
{
- if ((MagickRealType) GetIndexPixelComponent(indexes+x) < min_threshold)
+ if ((MagickRealType) GetPixelIndex(indexes+x) < min_threshold)
threshold.index=min_threshold;
else
- if ((MagickRealType) GetIndexPixelComponent(indexes+x) > max_threshold)
+ if ((MagickRealType) GetPixelIndex(indexes+x) > max_threshold)
threshold.index=max_threshold;
else
threshold.index=(MagickRealType) (QuantumRange*
GetPseudoRandomValue(random_info[id]));
}
if ((channel & RedChannel) != 0)
- SetRedPixelComponent(q,(MagickRealType) GetRedPixelComponent(q) <=
+ SetPixelRed(q,(MagickRealType) GetPixelRed(q) <=
threshold.red ? 0 : QuantumRange);
if ((channel & GreenChannel) != 0)
- SetGreenPixelComponent(q,(MagickRealType) GetGreenPixelComponent(q) <=
+ SetPixelGreen(q,(MagickRealType) GetPixelGreen(q) <=
threshold.green ? 0 : QuantumRange);
if ((channel & BlueChannel) != 0)
- SetBluePixelComponent(q,(MagickRealType) GetBluePixelComponent(q) <=
+ SetPixelBlue(q,(MagickRealType) GetPixelBlue(q) <=
threshold.blue ? 0 : QuantumRange);
if ((channel & OpacityChannel) != 0)
- SetOpacityPixelComponent(q,(MagickRealType) GetOpacityPixelComponent(q)
+ SetPixelOpacity(q,(MagickRealType) GetPixelOpacity(q)
<= threshold.opacity ? 0 : QuantumRange);
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetIndexPixelComponent(indexes+x,(MagickRealType)
- GetIndexPixelComponent(indexes+x) <= threshold.index ? 0 :
+ SetPixelIndex(indexes+x,(MagickRealType)
+ GetPixelIndex(indexes+x) <= threshold.index ? 0 :
QuantumRange);
q++;
}
@@ -2070,32 +2070,32 @@
{
if (PixelIntensity(q) > MagickPixelIntensity(&threshold))
{
- SetRedPixelComponent(q,QuantumRange);
- SetGreenPixelComponent(q,QuantumRange);
- SetBluePixelComponent(q,QuantumRange);
+ SetPixelRed(q,QuantumRange);
+ SetPixelGreen(q,QuantumRange);
+ SetPixelBlue(q,QuantumRange);
if (image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(indexes+x,QuantumRange);
+ SetPixelIndex(indexes+x,QuantumRange);
}
}
else
{
if (((channel & RedChannel) != 0) &&
- ((MagickRealType) GetRedPixelComponent(q) > threshold.red))
- SetRedPixelComponent(q,QuantumRange);
+ ((MagickRealType) GetPixelRed(q) > threshold.red))
+ SetPixelRed(q,QuantumRange);
if (((channel & GreenChannel) != 0) &&
- ((MagickRealType) GetGreenPixelComponent(q) > threshold.green))
- SetGreenPixelComponent(q,QuantumRange);
+ ((MagickRealType) GetPixelGreen(q) > threshold.green))
+ SetPixelGreen(q,QuantumRange);
if (((channel & BlueChannel) != 0) &&
- ((MagickRealType) GetBluePixelComponent(q) > threshold.blue))
- SetBluePixelComponent(q,QuantumRange);
+ ((MagickRealType) GetPixelBlue(q) > threshold.blue))
+ SetPixelBlue(q,QuantumRange);
if (((channel & OpacityChannel) != 0) &&
- ((MagickRealType) GetOpacityPixelComponent(q) > threshold.opacity))
- SetOpacityPixelComponent(q,QuantumRange);
+ ((MagickRealType) GetPixelOpacity(q) > threshold.opacity))
+ SetPixelOpacity(q,QuantumRange);
if (((channel & IndexChannel) != 0) &&
(image->colorspace == CMYKColorspace) &&
- ((MagickRealType) GetIndexPixelComponent(indexes+x)) >
+ ((MagickRealType) GetPixelIndex(indexes+x)) >
threshold.index)
- SetIndexPixelComponent(indexes+x,QuantumRange);
+ SetPixelIndex(indexes+x,QuantumRange);
}
q++;
}
diff --git a/magick/transform.c b/magick/transform.c
index 70168ff..65f16d2 100644
--- a/magick/transform.c
+++ b/magick/transform.c
@@ -197,7 +197,7 @@
if (indexes != (IndexPacket *) NULL)
{
if (chop_indexes != (IndexPacket *) NULL)
- *chop_indexes++=GetIndexPixelComponent(indexes+x);
+ *chop_indexes++=GetPixelIndex(indexes+x);
}
q++;
}
@@ -260,7 +260,7 @@
if (indexes != (IndexPacket *) NULL)
{
if (chop_indexes != (IndexPacket *) NULL)
- *chop_indexes++=GetIndexPixelComponent(indexes+x);
+ *chop_indexes++=GetPixelIndex(indexes+x);
}
q++;
}
@@ -368,7 +368,7 @@
break;
for (x=0; x < (ssize_t) images->columns; x++)
{
- SetRedPixelComponent(q,QuantumRange-PixelIntensityToQuantum(p));
+ SetPixelRed(q,QuantumRange-PixelIntensityToQuantum(p));
p++;
q++;
}
@@ -468,7 +468,7 @@
indexes=GetCacheViewAuthenticIndexQueue(cmyk_view);
for (x=0; x < (ssize_t) images->columns; x++)
{
- SetIndexPixelComponent(indexes+x,QuantumRange-
+ SetPixelIndex(indexes+x,QuantumRange-
PixelIntensityToQuantum(p));
p++;
}
@@ -1402,8 +1402,8 @@
(*--q)=(*p++);
if ((indexes != (const IndexPacket *) NULL) &&
(flop_indexes != (IndexPacket *) NULL))
- SetIndexPixelComponent(flop_indexes+flop_image->columns-x-1,
- GetIndexPixelComponent( indexes+x));
+ SetPixelIndex(flop_indexes+flop_image->columns-x-1,
+ GetPixelIndex( indexes+x));
}
if (SyncCacheViewAuthenticPixels(flop_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1822,15 +1822,15 @@
splice_indexes=GetCacheViewAuthenticIndexQueue(splice_view);
for (x=0; x < splice_geometry.x; x++)
{
- SetRedPixelComponent(q,GetRedPixelComponent(p));
- SetGreenPixelComponent(q,GetGreenPixelComponent(p));
- SetBluePixelComponent(q,GetBluePixelComponent(p));
- SetOpacityPixelComponent(q,OpaqueOpacity);
+ SetPixelRed(q,GetPixelRed(p));
+ SetPixelGreen(q,GetPixelGreen(p));
+ SetPixelBlue(q,GetPixelBlue(p));
+ SetPixelOpacity(q,OpaqueOpacity);
if (image->matte != MagickFalse)
- SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+ SetPixelOpacity(q,GetPixelOpacity(p));
if (image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(splice_indexes+x,
- GetIndexPixelComponent(indexes));
+ SetPixelIndex(splice_indexes+x,
+ GetPixelIndex(indexes));
indexes++;
p++;
q++;
@@ -1839,15 +1839,15 @@
q++;
for ( ; x < (ssize_t) splice_image->columns; x++)
{
- SetRedPixelComponent(q,GetRedPixelComponent(p));
- SetGreenPixelComponent(q,GetGreenPixelComponent(p));
- SetBluePixelComponent(q,GetBluePixelComponent(p));
- SetOpacityPixelComponent(q,OpaqueOpacity);
+ SetPixelRed(q,GetPixelRed(p));
+ SetPixelGreen(q,GetPixelGreen(p));
+ SetPixelBlue(q,GetPixelBlue(p));
+ SetPixelOpacity(q,OpaqueOpacity);
if (image->matte != MagickFalse)
- SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+ SetPixelOpacity(q,GetPixelOpacity(p));
if (image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(splice_indexes+x,
- GetIndexPixelComponent(indexes));
+ SetPixelIndex(splice_indexes+x,
+ GetPixelIndex(indexes));
indexes++;
p++;
q++;
@@ -1904,15 +1904,15 @@
splice_indexes=GetCacheViewAuthenticIndexQueue(splice_view);
for (x=0; x < splice_geometry.x; x++)
{
- SetRedPixelComponent(q,GetRedPixelComponent(p));
- SetGreenPixelComponent(q,GetGreenPixelComponent(p));
- SetBluePixelComponent(q,GetBluePixelComponent(p));
- SetOpacityPixelComponent(q,OpaqueOpacity);
+ SetPixelRed(q,GetPixelRed(p));
+ SetPixelGreen(q,GetPixelGreen(p));
+ SetPixelBlue(q,GetPixelBlue(p));
+ SetPixelOpacity(q,OpaqueOpacity);
if (image->matte != MagickFalse)
- SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+ SetPixelOpacity(q,GetPixelOpacity(p));
if (image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(splice_indexes+x,
- GetIndexPixelComponent(indexes));
+ SetPixelIndex(splice_indexes+x,
+ GetPixelIndex(indexes));
indexes++;
p++;
q++;
@@ -1921,15 +1921,15 @@
q++;
for ( ; x < (ssize_t) splice_image->columns; x++)
{
- SetRedPixelComponent(q,GetRedPixelComponent(p));
- SetGreenPixelComponent(q,GetGreenPixelComponent(p));
- SetBluePixelComponent(q,GetBluePixelComponent(p));
- SetOpacityPixelComponent(q,OpaqueOpacity);
+ SetPixelRed(q,GetPixelRed(p));
+ SetPixelGreen(q,GetPixelGreen(p));
+ SetPixelBlue(q,GetPixelBlue(p));
+ SetPixelOpacity(q,OpaqueOpacity);
if (image->matte != MagickFalse)
- SetOpacityPixelComponent(q,GetOpacityPixelComponent(p));
+ SetPixelOpacity(q,GetPixelOpacity(p));
if (image->colorspace == CMYKColorspace)
- SetIndexPixelComponent(splice_indexes+x,
- GetIndexPixelComponent(indexes));
+ SetPixelIndex(splice_indexes+x,
+ GetPixelIndex(indexes));
indexes++;
p++;
q++;
@@ -2359,8 +2359,8 @@
transverse_indexes=GetCacheViewAuthenticIndexQueue(transverse_view);
if (transverse_indexes != (IndexPacket *) NULL)
for (x=0; x < (ssize_t) image->columns; x++)
- SetIndexPixelComponent(transverse_indexes+image->columns-x-1,
- GetIndexPixelComponent(indexes+x));
+ SetPixelIndex(transverse_indexes+image->columns-x-1,
+ GetPixelIndex(indexes+x));
}
sync=SyncCacheViewAuthenticPixels(transverse_view,exception);
if (sync == MagickFalse)
diff --git a/magick/version.h b/magick/version.h
index 4c33ed2..f9c9e15 100644
--- a/magick/version.h
+++ b/magick/version.h
@@ -34,8 +34,8 @@
#define MagickLibAddendum "-9"
#define MagickLibInterface 4
#define MagickLibMinInterface 4
-#define MagickReleaseDate "2011-06-15"
-#define MagickChangeDate "20110615"
+#define MagickReleaseDate "2011-06-25"
+#define MagickChangeDate "20110618"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#define MagickOpenMPFeature "OpenMP "
diff --git a/magick/xwindow.c b/magick/xwindow.c
index 65edc69..dfedc33 100644
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -561,29 +561,29 @@
break;
for (x=0; x < (int) annotate_image->columns; x++)
{
- SetOpacityPixelComponent(q,OpaqueOpacity);
+ SetPixelOpacity(q,OpaqueOpacity);
if (XGetPixel(annotate_ximage,x,y) == 0)
{
/*
Set this pixel to the background color.
*/
- SetRedPixelComponent(q,ScaleShortToQuantum(pixel->box_color.red));
- SetGreenPixelComponent(q,ScaleShortToQuantum(pixel->box_color.green));
- SetBluePixelComponent(q,ScaleShortToQuantum(pixel->box_color.blue));
+ SetPixelRed(q,ScaleShortToQuantum(pixel->box_color.red));
+ SetPixelGreen(q,ScaleShortToQuantum(pixel->box_color.green));
+ SetPixelBlue(q,ScaleShortToQuantum(pixel->box_color.blue));
if ((annotate_info->stencil == ForegroundStencil) ||
(annotate_info->stencil == OpaqueStencil))
- SetOpacityPixelComponent(q,TransparentOpacity);
+ SetPixelOpacity(q,TransparentOpacity);
}
else
{
/*
Set this pixel to the pen color.
*/
- SetRedPixelComponent(q,ScaleShortToQuantum(pixel->pen_color.red));
- SetGreenPixelComponent(q,ScaleShortToQuantum(pixel->pen_color.green));
- SetBluePixelComponent(q,ScaleShortToQuantum(pixel->pen_color.blue));
+ SetPixelRed(q,ScaleShortToQuantum(pixel->pen_color.red));
+ SetPixelGreen(q,ScaleShortToQuantum(pixel->pen_color.green));
+ SetPixelBlue(q,ScaleShortToQuantum(pixel->pen_color.blue));
if (annotate_info->stencil == BackgroundStencil)
- SetOpacityPixelComponent(q,TransparentOpacity);
+ SetPixelOpacity(q,TransparentOpacity);
}
q++;
}
@@ -2207,11 +2207,11 @@
for (x=0; x < (int) image->columns; x++)
{
color.red=ClampToQuantum((MagickRealType) (red_map[i][j][(int)
- ScaleQuantumToChar(GetRedPixelComponent(p))] << 8));
+ ScaleQuantumToChar(GetPixelRed(p))] << 8));
color.green=ClampToQuantum((MagickRealType) (green_map[i][j][(int)
- ScaleQuantumToChar(GetGreenPixelComponent(p))] << 8));
+ ScaleQuantumToChar(GetPixelGreen(p))] << 8));
color.blue=ClampToQuantum((MagickRealType) (blue_map[i][j][(int)
- ScaleQuantumToChar(GetBluePixelComponent(p))] << 8));
+ ScaleQuantumToChar(GetPixelBlue(p))] << 8));
pixel=(size_t) (((size_t) color.red & 0xe0) |
(((size_t) color.green & 0xe0) >> 3) |
(((size_t) color.blue & 0xc0) >> 6));
@@ -2483,10 +2483,10 @@
/*
Set this pixel to the pen color.
*/
- SetRedPixelComponent(q,ScaleShortToQuantum(pixel->pen_color.red));
- SetGreenPixelComponent(q,ScaleShortToQuantum(pixel->pen_color.green));
- SetBluePixelComponent(q,ScaleShortToQuantum(pixel->pen_color.blue));
- SetOpacityPixelComponent(q,(Quantum) (draw_info->stencil ==
+ SetPixelRed(q,ScaleShortToQuantum(pixel->pen_color.red));
+ SetPixelGreen(q,ScaleShortToQuantum(pixel->pen_color.green));
+ SetPixelBlue(q,ScaleShortToQuantum(pixel->pen_color.blue));
+ SetPixelOpacity(q,(Quantum) (draw_info->stencil ==
OpaqueStencil ? OpaqueOpacity : TransparentOpacity));
}
q++;
@@ -2592,7 +2592,7 @@
for (x=0; x < (int) draw_image->columns; x++)
{
if (q->opacity != (Quantum) TransparentOpacity)
- SetOpacityPixelComponent(q,OpaqueOpacity);
+ SetPixelOpacity(q,OpaqueOpacity);
q++;
}
if (SyncCacheViewAuthenticPixels(draw_view,exception) == MagickFalse)
@@ -4382,13 +4382,13 @@
{
pixel=XGetPixel(ximage,x,y);
index=(pixel >> red_shift) & red_mask;
- SetRedPixelComponent(q,ScaleShortToQuantum(
+ SetPixelRed(q,ScaleShortToQuantum(
colors[index].red));
index=(pixel >> green_shift) & green_mask;
- SetGreenPixelComponent(q,ScaleShortToQuantum(
+ SetPixelGreen(q,ScaleShortToQuantum(
colors[index].green));
index=(pixel >> blue_shift) & blue_mask;
- SetBluePixelComponent(q,ScaleShortToQuantum(
+ SetPixelBlue(q,ScaleShortToQuantum(
colors[index].blue));
q++;
}
@@ -4407,15 +4407,15 @@
pixel=XGetPixel(ximage,x,y);
color=(pixel >> red_shift) & red_mask;
color=(65535UL*color)/red_mask;
- SetRedPixelComponent(q,ScaleShortToQuantum((unsigned short)
+ SetPixelRed(q,ScaleShortToQuantum((unsigned short)
color));
color=(pixel >> green_shift) & green_mask;
color=(65535UL*color)/green_mask;
- SetGreenPixelComponent(q,ScaleShortToQuantum((unsigned short)
+ SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
color));
color=(pixel >> blue_shift) & blue_mask;
color=(65535UL*color)/blue_mask;
- SetBluePixelComponent(q,ScaleShortToQuantum((unsigned short)
+ SetPixelBlue(q,ScaleShortToQuantum((unsigned short)
color));
q++;
}
@@ -4457,8 +4457,8 @@
for (x=0; x < (int) composite_image->columns; x++)
{
index=(IndexPacket) XGetPixel(ximage,x,y);
- SetIndexPixelComponent(indexes+x,index);
- SetRGBOPixelComponents(q,composite_image->colormap+(ssize_t)
+ SetPixelIndex(indexes+x,index);
+ SetPixelRGBO(q,composite_image->colormap+(ssize_t)
index);
q++;
}
@@ -5940,7 +5940,7 @@
for (x=0; x < (int) canvas->columns; x++)
{
byte>>=1;
- if (GetIndexPixelComponent(indexes+x) == (IndexPacket) polarity)
+ if (GetPixelIndex(indexes+x) == (IndexPacket) polarity)
byte|=foreground;
else
byte|=background;
@@ -5979,7 +5979,7 @@
nibble=0;
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)] & 0x0f;
+ pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)] & 0x0f;
switch (nibble)
{
case 0:
@@ -6031,7 +6031,7 @@
nibble=0;
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)] & 0xf;
+ pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)] & 0xf;
switch (nibble)
{
case 0:
@@ -6074,7 +6074,7 @@
indexes=GetCacheViewVirtualIndexQueue(canvas_view);
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)];
+ pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)];
*q++=(unsigned char) pixel;
}
q+=scanline_pad;
@@ -6105,7 +6105,7 @@
indexes=GetCacheViewVirtualIndexQueue(canvas_view);
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)];
+ pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)];
for (k=0; k < (int) bytes_per_pixel; k++)
{
channel[k]=(unsigned char) pixel;
@@ -6269,11 +6269,11 @@
for (x=(int) canvas->columns-1; x >= 0; x--)
{
*q++=ScaleQuantumToChar(XBlueGamma(
- GetBluePixelComponent(p)));
+ GetPixelBlue(p)));
*q++=ScaleQuantumToChar(XGreenGamma(
- GetGreenPixelComponent(p)));
+ GetPixelGreen(p)));
*q++=ScaleQuantumToChar(XRedGamma(
- GetRedPixelComponent(p)));
+ GetPixelRed(p)));
*q++=0;
p++;
}
@@ -6281,9 +6281,9 @@
}
for (x=(int) canvas->columns-1; x >= 0; x--)
{
- *q++=ScaleQuantumToChar((Quantum) GetBluePixelComponent(p));
- *q++=ScaleQuantumToChar((Quantum) GetGreenPixelComponent(p));
- *q++=ScaleQuantumToChar((Quantum) GetRedPixelComponent(p));
+ *q++=ScaleQuantumToChar((Quantum) GetPixelBlue(p));
+ *q++=ScaleQuantumToChar((Quantum) GetPixelGreen(p));
+ *q++=ScaleQuantumToChar((Quantum) GetPixelRed(p));
*q++=0;
p++;
}
@@ -6313,11 +6313,11 @@
for (x=(int) canvas->columns-1; x >= 0; x--)
{
*q++=ScaleQuantumToChar(XRedGamma(
- GetRedPixelComponent(p)));
+ GetPixelRed(p)));
*q++=ScaleQuantumToChar(XGreenGamma(
- GetGreenPixelComponent(p)));
+ GetPixelGreen(p)));
*q++=ScaleQuantumToChar(XBlueGamma(
- GetBluePixelComponent(p)));
+ GetPixelBlue(p)));
*q++=0;
p++;
}
@@ -6326,11 +6326,11 @@
for (x=(int) canvas->columns-1; x >= 0; x--)
{
*q++=ScaleQuantumToChar((Quantum)
- GetRedPixelComponent(p));
+ GetPixelRed(p));
*q++=ScaleQuantumToChar((Quantum)
- GetGreenPixelComponent(p));
+ GetPixelGreen(p));
*q++=ScaleQuantumToChar((Quantum)
- GetBluePixelComponent(p));
+ GetPixelBlue(p));
*q++=0;
p++;
}
@@ -6394,7 +6394,7 @@
for (x=(int) canvas->columns-1; x >= 0; x--)
{
byte>>=1;
- if (GetOpacityPixelComponent(p) > (QuantumRange/2))
+ if (GetPixelOpacity(p) > (QuantumRange/2))
byte|=0x80;
bit++;
if (bit == 8)
@@ -6567,7 +6567,7 @@
for (x=(int) canvas->columns-1; x >= 0; x--)
{
byte<<=1;
- if (GetIndexPixelComponent(indexes+x) == (IndexPacket) polarity)
+ if (GetPixelIndex(indexes+x) == (IndexPacket) polarity)
byte|=foreground;
else
byte|=background;
@@ -6606,7 +6606,7 @@
nibble=0;
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)] & 0xf;
+ pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)] & 0xf;
switch (nibble)
{
case 0:
@@ -6658,7 +6658,7 @@
nibble=0;
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)] & 0xf;
+ pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)] & 0xf;
switch (nibble)
{
case 0:
@@ -6701,7 +6701,7 @@
indexes=GetCacheViewVirtualIndexQueue(canvas_view);
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)];
+ pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)];
*q++=(unsigned char) pixel;
}
q+=scanline_pad;
@@ -6732,7 +6732,7 @@
indexes=GetCacheViewVirtualIndexQueue(canvas_view);
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetIndexPixelComponent(indexes+x)];
+ pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)];
for (k=(int) bytes_per_pixel-1; k >= 0; k--)
{
channel[k]=(unsigned char) pixel;
@@ -6897,11 +6897,11 @@
{
*q++=0;
*q++=ScaleQuantumToChar(XRedGamma(
- GetRedPixelComponent(p)));
+ GetPixelRed(p)));
*q++=ScaleQuantumToChar(XGreenGamma(
- GetGreenPixelComponent(p)));
+ GetPixelGreen(p)));
*q++=ScaleQuantumToChar(XBlueGamma(
- GetBluePixelComponent(p)));
+ GetPixelBlue(p)));
p++;
}
continue;
@@ -6909,9 +6909,9 @@
for (x=(int) canvas->columns-1; x >= 0; x--)
{
*q++=0;
- *q++=ScaleQuantumToChar((Quantum) GetRedPixelComponent(p));
- *q++=ScaleQuantumToChar((Quantum) GetGreenPixelComponent(p));
- *q++=ScaleQuantumToChar((Quantum) GetBluePixelComponent(p));
+ *q++=ScaleQuantumToChar((Quantum) GetPixelRed(p));
+ *q++=ScaleQuantumToChar((Quantum) GetPixelGreen(p));
+ *q++=ScaleQuantumToChar((Quantum) GetPixelBlue(p));
p++;
}
}
@@ -6941,11 +6941,11 @@
{
*q++=0;
*q++=ScaleQuantumToChar(XBlueGamma(
- GetBluePixelComponent(p)));
+ GetPixelBlue(p)));
*q++=ScaleQuantumToChar(XGreenGamma(
- GetGreenPixelComponent(p)));
+ GetPixelGreen(p)));
*q++=ScaleQuantumToChar(XRedGamma(
- GetRedPixelComponent(p)));
+ GetPixelRed(p)));
p++;
}
continue;
@@ -6954,11 +6954,11 @@
{
*q++=0;
*q++=ScaleQuantumToChar((Quantum)
- GetBluePixelComponent(p));
+ GetPixelBlue(p));
*q++=ScaleQuantumToChar((Quantum)
- GetGreenPixelComponent(p));
+ GetPixelGreen(p));
*q++=ScaleQuantumToChar((Quantum)
- GetRedPixelComponent(p));
+ GetPixelRed(p));
p++;
}
}
@@ -7021,7 +7021,7 @@
for (x=(int) canvas->columns-1; x >= 0; x--)
{
byte<<=1;
- if (GetOpacityPixelComponent(p) > (QuantumRange/2))
+ if (GetPixelOpacity(p) > (QuantumRange/2))
byte|=0x01;
bit++;
if (bit == 8)
@@ -7764,20 +7764,20 @@
{
for (i=0; i < (ssize_t) number_colors; i++)
{
- SetRedPixelComponent(q,0);
+ SetPixelRed(q,0);
if (map_info->red_max != 0)
- SetRedPixelComponent(q,ScaleXToQuantum((size_t) (i/
+ SetPixelRed(q,ScaleXToQuantum((size_t) (i/
map_info->red_mult),map_info->red_max));
- SetGreenPixelComponent(q,0);
+ SetPixelGreen(q,0);
if (map_info->green_max != 0)
- SetGreenPixelComponent(q,ScaleXToQuantum((size_t) ((i/
+ SetPixelGreen(q,ScaleXToQuantum((size_t) ((i/
map_info->green_mult) % (map_info->green_max+1)),
map_info->green_max));
- SetBluePixelComponent(q,0);
+ SetPixelBlue(q,0);
if (map_info->blue_max != 0)
- SetBluePixelComponent(q,ScaleXToQuantum((size_t) (i %
+ SetPixelBlue(q,ScaleXToQuantum((size_t) (i %
map_info->green_mult),map_info->blue_max));
- SetOpacityPixelComponent(q,TransparentOpacity);
+ SetPixelOpacity(q,TransparentOpacity);
q++;
}
(void) SyncAuthenticPixels(affinity_image,exception);
@@ -7965,7 +7965,7 @@
break;
indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=(int) image->columns-1; x >= 0; x--)
- diversity[(ssize_t) GetIndexPixelComponent(indexes+x)].count++;
+ diversity[(ssize_t) GetPixelIndex(indexes+x)].count++;
}
image_view=DestroyCacheView(image_view);
/*