diff --git a/coders/debug.c b/coders/debug.c
index b287e6c..9da08b5 100644
--- a/coders/debug.c
+++ b/coders/debug.c
@@ -226,7 +226,7 @@
(void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double)
x,(double) y);
(void) WriteBlobString(image,buffer);
- SetPixelInfo(image,p,&pixel);
+ GetPixelInfoPixel(image,p,&pixel);
(void) FormatLocaleString(tuple,MaxTextExtent,"%.20g,%.20g,%.20g ",
(double) pixel.red,(double) pixel.green,(double) pixel.blue);
if (pixel.colorspace == CMYKColorspace)
diff --git a/coders/gif.c b/coders/gif.c
index 3794ccf3..73b314c 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -443,7 +443,7 @@
break;
index=ConstrainColormapIndex(image,(size_t) c,exception);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
SetPixelAlpha(image,(ssize_t) index == opacity ? TransparentAlpha :
OpaqueAlpha,q);
x++;
diff --git a/coders/jbig.c b/coders/jbig.c
index 58113af..9395e94 100644
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -235,7 +235,7 @@
if (bit == 8)
bit=0;
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 18d630e..67c7e5b 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1293,7 +1293,7 @@
pixel=(size_t) ((GETJSAMPLE(*p) ^ 0x80) << 4);
index=ConstrainColormapIndex(image,pixel,exception);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
p++;
q+=GetPixelChannels(image);
}
@@ -1331,7 +1331,7 @@
{
index=ConstrainColormapIndex(image,(size_t) GETJSAMPLE(*p),exception);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
p++;
q+=GetPixelChannels(image);
}
diff --git a/coders/map.c b/coders/map.c
index 82199a2..bd680b2 100644
--- a/coders/map.c
+++ b/coders/map.c
@@ -227,7 +227,7 @@
p++;
}
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
diff --git a/coders/miff.c b/coders/miff.c
index f3b2877..cb9b6bf 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -2409,11 +2409,11 @@
case RLECompression:
{
length=0;
- SetPixelInfo(image,p,&pixel);
+ GetPixelInfoPixel(image,p,&pixel);
p+=GetPixelChannels(image);
for (x=1; x < (ssize_t) image->columns; x++)
{
- SetPixelInfo(image,p,&target);
+ GetPixelInfoPixel(image,p,&target);
if ((length < 255) &&
(IsPixelInfoEquivalent(&pixel,&target) != MagickFalse))
length++;
@@ -2422,7 +2422,7 @@
q=PopRunlengthPacket(image,q,length,&pixel,exception);
length=0;
}
- SetPixelInfo(image,p,&pixel);
+ GetPixelInfoPixel(image,p,&pixel);
p+=GetPixelChannels(image);
}
q=PopRunlengthPacket(image,q,length,&pixel,exception);
diff --git a/coders/null.c b/coders/null.c
index 842d1d9..65f912a 100644
--- a/coders/null.c
+++ b/coders/null.c
@@ -138,7 +138,7 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelPixelInfo(image,&background,q);
+ SetPixelInfoPixel(image,&background,q);
q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
diff --git a/coders/palm.c b/coders/palm.c
index 8baf541..abc3a7b 100644
--- a/coders/palm.c
+++ b/coders/palm.c
@@ -489,7 +489,7 @@
ThrowReaderException(CorruptImageError,"CorruptImage");
index=(Quantum) (mask-(((*ptr) & (mask << bit)) >> bit));
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
if (bit)
bit-=bits_per_pixel;
else
diff --git a/coders/png.c b/coders/png.c
index cc10247..81b7a4c 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -8521,7 +8521,7 @@
{
if (GetPixelAlpha(image,r) < OpaqueAlpha/2)
{
- SetPixelPixelInfo(image,&image->background_color,r);
+ SetPixelInfoPixel(image,&image->background_color,r);
SetPixelAlpha(image,TransparentAlpha,r);
}
else
diff --git a/coders/psd.c b/coders/psd.c
index 0207dd6..679126b 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -652,7 +652,7 @@
SetPixelIndex(image,ScaleQuantumToChar(pixel),q);
else
SetPixelIndex(image,ScaleQuantumToShort(pixel),q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t)
+ SetPixelInfoPixel(image,image->colormap+(ssize_t)
GetPixelIndex(image,q),q);
if (image->depth == 1)
{
@@ -667,7 +667,7 @@
{
SetPixelIndex(image,(((unsigned char) pixel) &
(0x01 << (7-bit))) != 0 ? 0 : 255,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t)
+ SetPixelInfoPixel(image,image->colormap+(ssize_t)
GetPixelIndex(image,q),q);
q+=GetPixelChannels(image);
x++;
diff --git a/coders/svg.c b/coders/svg.c
index 779d224..8a9a120 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -3403,7 +3403,7 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelInfo(image,p,&pixel);
+ GetPixelInfoPixel(image,p,&pixel);
(void) QueryColorname(image,&pixel,SVGCompliance,tuple,exception);
(void) FormatLocaleString(message,MaxTextExtent,
" <circle cx=\"%.20g\" cy=\"%.20g\" r=\"1\" fill=\"%s\"/>\n",
diff --git a/coders/ttf.c b/coders/ttf.c
index 170d754..fdaf912 100644
--- a/coders/ttf.c
+++ b/coders/ttf.c
@@ -237,7 +237,7 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelPixelInfo(image,&background_color,q);
+ SetPixelInfoPixel(image,&background_color,q);
q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
diff --git a/coders/txt.c b/coders/txt.c
index 412a30c..56c7154 100644
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -668,7 +668,7 @@
(void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double)
x,(double) y);
(void) WriteBlobString(image,buffer);
- SetPixelInfo(image,p,&pixel);
+ GetPixelInfoPixel(image,p,&pixel);
(void) CopyMagickString(tuple,"(",MaxTextExtent);
ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance,
tuple);
diff --git a/coders/wpg.c b/coders/wpg.c
index 0e1b8ec..743049d 100644
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -292,7 +292,7 @@
{
index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
}
p++;
@@ -303,7 +303,7 @@
{
index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
}
p++;
@@ -321,19 +321,19 @@
{
index=ConstrainColormapIndex(image,(*p >> 6) & 0x3,exception);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p >> 4) & 0x3,exception);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p >> 2) & 0x3,exception);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p) & 0x3,exception);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
p++;
q+=GetPixelChannels(image);
}
@@ -341,14 +341,14 @@
{
index=ConstrainColormapIndex(image,(*p >> 6) & 0x3,exception);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
if ((image->columns % 4) >= 1)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x3,exception);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
if ((image->columns % 4) >= 2)
@@ -356,7 +356,7 @@
index=ConstrainColormapIndex(image,(*p >> 2) & 0x3,
exception);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
}
}
@@ -376,11 +376,11 @@
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f,exception);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p) & 0x0f,exception);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
p++;
q+=GetPixelChannels(image);
}
@@ -388,7 +388,7 @@
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f,exception);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
p++;
q+=GetPixelChannels(image);
}
@@ -405,7 +405,7 @@
{
index=ConstrainColormapIndex(image,*p,exception);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
p++;
q+=GetPixelChannels(image);
}
diff --git a/coders/xc.c b/coders/xc.c
index 1664ae8..59b8170 100644
--- a/coders/xc.c
+++ b/coders/xc.c
@@ -137,7 +137,7 @@
image->colorspace=color.colorspace;
image->matte=color.matte;
pixel.black=0;
- SetPacketPixelInfo(image,&color,&pixel);
+ SetPixelInfo(image,&color,&pixel);
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
@@ -145,7 +145,7 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelPixelInfo(image,&pixel,q);
+ SetPixelInfoPixel(image,&pixel,q);
if (image->colorspace == CMYKColorspace)
SetPixelBlack(image,pixel.black,q);
q+=GetPixelChannels(image);
diff --git a/coders/xpm.c b/coders/xpm.c
index dc579ab..1e69e60 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -405,7 +405,7 @@
j=(ssize_t) GetValueFromSplayTree(xpm_colors,key);
if (image->storage_class == PseudoClass)
SetPixelIndex(image,j,r);
- SetPixelPixelInfo(image,image->colormap+j,r);
+ SetPixelInfoPixel(image,image->colormap+j,r);
p+=width;
r+=GetPixelChannels(image);
}
diff --git a/coders/xwd.c b/coders/xwd.c
index ab47d87..2154a7e 100644
--- a/coders/xwd.c
+++ b/coders/xwd.c
@@ -476,7 +476,7 @@
index=ConstrainColormapIndex(image,XGetPixel(ximage,(int) x,
(int) y),exception);
SetPixelIndex(image,index,q);
- SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
+ SetPixelInfoPixel(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)