diff --git a/coders/bmp.c b/coders/bmp.c
index 6efd7f9..8c3b4a5 100644
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -555,11 +555,11 @@
count=ReadBlob(image,2,magick);
do
{
- PixelLongPacket
- shift;
+ PixelInfo
+ quantum_bits;
PixelPacket
- quantum_bits;
+ shift;
size_t
profile_data,
diff --git a/coders/braille.c b/coders/braille.c
index 3b78180..f4a5a13 100644
--- a/coders/braille.c
+++ b/coders/braille.c
@@ -252,11 +252,11 @@
(void) SetImageType(image,BilevelType,exception);
polarity = 0;
if (image->storage_class == PseudoClass) {
- polarity=(Quantum) (GetPixelPacketIntensity(&image->colormap[0]) >=
+ polarity=(Quantum) (GetPixelInfoIntensity(&image->colormap[0]) >=
(Quantum) (QuantumRange/2));
if (image->colors == 2)
- polarity=(Quantum) (GetPixelPacketIntensity(&image->colormap[0]) >=
- GetPixelPacketIntensity(&image->colormap[1]));
+ polarity=(Quantum) (GetPixelInfoIntensity(&image->colormap[0]) >=
+ GetPixelInfoIntensity(&image->colormap[1]));
}
for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) cell_height)
{
diff --git a/coders/dcm.c b/coders/dcm.c
index 3cf291e..2a42e89 100644
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -3638,7 +3638,7 @@
image->columns=(size_t) width;
image->rows=(size_t) height;
image->depth=depth;
- if ((image->colormap == (PixelPacket *) NULL) && (samples_per_pixel == 1))
+ if ((image->colormap == (PixelInfo *) NULL) && (samples_per_pixel == 1))
{
size_t
one;
@@ -3774,7 +3774,7 @@
int
byte;
- PixelLongPacket
+ PixelPacket
pixel;
/*
diff --git a/coders/gif.c b/coders/gif.c
index 16b4247..55b6ea7 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -443,7 +443,7 @@
break;
index=ConstrainColormapIndex(image,(size_t) c);
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
SetPixelAlpha(image,(ssize_t) index == opacity ? TransparentAlpha :
OpaqueAlpha,q);
x++;
@@ -1652,7 +1652,7 @@
c|=(bits_per_pixel-1); /* size of global colormap */
(void) WriteBlobByte(image,(unsigned char) c);
for (j=0; j < (ssize_t) image->colors; j++)
- if (IsPixelPacketEquivalent(&image->background_color,image->colormap+j))
+ if (IsPixelInfoEquivalent(&image->background_color,image->colormap+j))
break;
(void) WriteBlobByte(image,(unsigned char)
(j == (ssize_t) image->colors ? 0 : j)); /* background color */
diff --git a/coders/gradient.c b/coders/gradient.c
index 8cd14f6..b0d3336 100644
--- a/coders/gradient.c
+++ b/coders/gradient.c
@@ -100,7 +100,7 @@
MagickBooleanType
status;
- PixelPacket
+ PixelInfo
start_color,
stop_color;
@@ -128,7 +128,7 @@
return((Image *) NULL);
}
(void) CopyMagickString(colorname,"white",MaxTextExtent);
- if (GetPixelPacketIntensity(&start_color) > (Quantum) (QuantumRange/2))
+ if (GetPixelInfoIntensity(&start_color) > (Quantum) (QuantumRange/2))
(void) CopyMagickString(colorname,"black",MaxTextExtent);
(void) sscanf(image_info->filename,"%*[^-]-%s",colorname);
status=QueryColorCompliance(colorname,AllCompliance,&stop_color,exception);
diff --git a/coders/jbig.c b/coders/jbig.c
index 1304e9b..a54a904 100644
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -234,7 +234,7 @@
if (bit == 8)
bit=0;
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(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 cb7118d..1e23954 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1289,7 +1289,7 @@
pixel=(size_t) ((GETJSAMPLE(*p) ^ 0x80) << 4);
index=ConstrainColormapIndex(image,pixel);
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
p++;
q+=GetPixelChannels(image);
}
@@ -1327,7 +1327,7 @@
{
index=ConstrainColormapIndex(image,(size_t) GETJSAMPLE(*p));
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
p++;
q+=GetPixelChannels(image);
}
diff --git a/coders/map.c b/coders/map.c
index f864b57..8e3c009 100644
--- a/coders/map.c
+++ b/coders/map.c
@@ -226,7 +226,7 @@
p++;
}
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
diff --git a/coders/palm.c b/coders/palm.c
index a9f45b9..28082bc 100644
--- a/coders/palm.c
+++ b/coders/palm.c
@@ -175,20 +175,20 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% FindColor() returns the index of the matching entry from PalmPalette for a
-% given PixelPacket.
+% given PixelInfo.
%
% The format of the FindColor method is:
%
-% int FindColor(const Image *image,PixelPacket *pixel)
+% int FindColor(const Image *image,PixelInfo *pixel)
%
% A description of each parameter follows:
%
% o int: the index of the matching color or -1 if not found/
%
-% o pixel: a pointer to the PixelPacket to be matched.
+% o pixel: a pointer to the PixelInfo to be matched.
%
*/
-static int FindColor(const Image *image,PixelPacket *packet)
+static int FindColor(const Image *image,PixelInfo *packet)
{
register ssize_t
i;
@@ -489,7 +489,7 @@
ThrowReaderException(CorruptImageError,"CorruptImage");
index=(Quantum) (mask-(((*ptr) & (mask << bit)) >> bit));
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
if (bit)
bit-=bits_per_pixel;
else
@@ -668,7 +668,7 @@
MagickSizeType
cc;
- PixelPacket
+ PixelInfo
transpix;
QuantizeInfo
diff --git a/coders/pcx.c b/coders/pcx.c
index 42feec6..11e7d34 100644
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -1094,11 +1094,11 @@
/*
Convert PseudoClass image to a PCX monochrome image.
*/
- polarity=(Quantum) (GetPixelPacketIntensity(
+ polarity=(Quantum) (GetPixelInfoIntensity(
&image->colormap[0]) < ((Quantum) QuantumRange/2) ? 1 : 0);
if (image->colors == 2)
- polarity=(Quantum) (GetPixelPacketIntensity(&image->colormap[0]) <
- GetPixelPacketIntensity(&image->colormap[1]) ? 1 : 0);
+ polarity=(Quantum) (GetPixelInfoIntensity(&image->colormap[0]) <
+ GetPixelInfoIntensity(&image->colormap[1]) ? 1 : 0);
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
diff --git a/coders/png.c b/coders/png.c
index 0e77540..a710891 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -129,7 +129,7 @@
#endif
/* Macros for left-bit-replication to ensure that pixels
- * and PixelPackets all have the image->depth, and for use
+ * and PixelInfos all have the image->depth, and for use
* in PNG8 quantization.
*/
@@ -903,7 +903,7 @@
magn_methx,
magn_methy;
- PixelPacket
+ PixelInfo
mng_global_bkgd;
/* Added at version 6.6.6-7 */
@@ -1145,7 +1145,7 @@
if (image->storage_class == PseudoClass)
{
for (i=0; i < (ssize_t) image->colors; i++)
- if (IsPixelPacketGray(image->colormap+i) == MagickFalse)
+ if (IsPixelInfoGray(image->colormap+i) == MagickFalse)
return(MagickFalse);
return(MagickTrue);
}
@@ -2000,7 +2000,7 @@
double
file_gamma;
- PixelLongPacket
+ PixelInfo
transparent_color;
MagickBooleanType
@@ -2627,7 +2627,7 @@
" Raw tRNS graylevel is %d.",ping_trans_color->gray);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " scaled graylevel is %d.",transparent_color.alpha);
+ " scaled graylevel is %.20g.",transparent_color.alpha);
}
transparent_color.red=transparent_color.alpha;
transparent_color.green=transparent_color.alpha;
@@ -4602,7 +4602,7 @@
previous_fb;
#if defined(MNG_INSERT_LAYERS)
- PixelPacket
+ PixelInfo
mng_background_color;
#endif
@@ -7979,7 +7979,7 @@
int
n;
- PixelPacket
+ PixelInfo
opaque[260],
semitransparent[260],
transparent[260];
@@ -8074,7 +8074,7 @@
{
if (number_opaque == 0)
{
- GetPixelPacketPixel(image, q, opaque);
+ GetPixelInfoPixel(image, q, opaque);
opaque[0].alpha=OpaqueAlpha;
number_opaque=1;
}
@@ -8089,7 +8089,7 @@
number_opaque < 259)
{
number_opaque++;
- GetPixelPacketPixel(image, q, opaque+i);
+ GetPixelInfoPixel(image, q, opaque+i);
opaque[i].alpha=OpaqueAlpha;
}
}
@@ -8100,7 +8100,7 @@
{
if (number_transparent == 0)
{
- GetPixelPacketPixel(image, q, transparent);
+ GetPixelInfoPixel(image, q, transparent);
ping_trans_color.red=(unsigned short)
GetPixelRed(image,q);
ping_trans_color.green=(unsigned short)
@@ -8122,7 +8122,7 @@
number_transparent < 259)
{
number_transparent++;
- GetPixelPacketPixel(image,q,transparent+i);
+ GetPixelInfoPixel(image,q,transparent+i);
}
}
}
@@ -8132,7 +8132,7 @@
{
if (number_semitransparent == 0)
{
- GetPixelPacketPixel(image,q,semitransparent);
+ GetPixelInfoPixel(image,q,semitransparent);
number_semitransparent = 1;
}
@@ -8148,7 +8148,7 @@
number_semitransparent < 259)
{
number_semitransparent++;
- GetPixelPacketPixel(image, q, semitransparent+i);
+ GetPixelInfoPixel(image, q, semitransparent+i);
}
}
}
@@ -8270,7 +8270,7 @@
if (image_colors < 257)
{
- PixelPacket
+ PixelInfo
colormap[260];
/*
@@ -8491,7 +8491,7 @@
{
if (GetPixelAlpha(image,r) < OpaqueAlpha/2)
{
- SetPixelPacket(image,&image->background_color,r);
+ SetPixelPixelInfo(image,&image->background_color,r);
SetPixelAlpha(image,TransparentAlpha,r);
}
else
@@ -9360,7 +9360,7 @@
(ScaleQuantumToShort(image->colormap[0].blue) & mask);
ping_trans_color.gray=(png_uint_16)
- (ScaleQuantumToShort(GetPixelPacketIntensity(
+ (ScaleQuantumToShort(GetPixelInfoIntensity(
image->colormap)) & mask);
ping_trans_color.index=(png_byte) 0;
@@ -9639,7 +9639,7 @@
{
ping_background.gray=(png_uint_16)
- ((maxval/255.)*((GetPixelPacketIntensity(&image->background_color)))
+ ((maxval/255.)*((GetPixelInfoIntensity(&image->background_color)))
+.5);
if (logging != MagickFalse)
diff --git a/coders/ps.c b/coders/ps.c
index 945b1eb..298c95e 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -1357,7 +1357,7 @@
MagickStatusType
flags;
- PixelPacket
+ PixelInfo
pixel;
PointInfo
@@ -1883,7 +1883,7 @@
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
if (p == (const Quantum *) NULL)
break;
- GetPixelPacketPixel(image,p,&pixel);
+ GetPixelInfoPixel(image,p,&pixel);
length=255;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -1907,7 +1907,7 @@
}
length=0;
}
- GetPixelPacketPixel(image,p,&pixel);
+ GetPixelInfoPixel(image,p,&pixel);
p+=GetPixelChannels(image);
}
WriteRunlengthPacket(image,pixel,length,p);
diff --git a/coders/psd.c b/coders/psd.c
index 3054257..68f2e7b 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -652,7 +652,7 @@
SetPixelIndex(image,ScaleQuantumToChar(pixel),q);
else
SetPixelIndex(image,ScaleQuantumToShort(pixel),q);
- SetPixelPacket(image,image->colormap+(ssize_t)
+ SetPixelPixelInfo(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);
- SetPixelPacket(image,image->colormap+(ssize_t)
+ SetPixelPixelInfo(image,image->colormap+(ssize_t)
GetPixelIndex(image,q),q);
q+=GetPixelChannels(image);
x++;
diff --git a/coders/rle.c b/coders/rle.c
index e2900cd..8111105 100644
--- a/coders/rle.c
+++ b/coders/rle.c
@@ -545,7 +545,7 @@
break;
}
}
- image->colormap=(PixelPacket *) RelinquishMagickMemory(
+ image->colormap=(PixelInfo *) RelinquishMagickMemory(
image->colormap);
image->storage_class=DirectClass;
image->colors=0;
diff --git a/coders/stegano.c b/coders/stegano.c
index 9951912..c5922d5 100644
--- a/coders/stegano.c
+++ b/coders/stegano.c
@@ -118,7 +118,7 @@
MagickBooleanType
status;
- PixelPacket
+ PixelInfo
pixel;
register Quantum
diff --git a/coders/svg.c b/coders/svg.c
index faa3f52..5db0096 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -2819,7 +2819,7 @@
ssize_t
y;
- PixelPacket
+ PixelInfo
fill_color;
register ssize_t
diff --git a/coders/tga.c b/coders/tga.c
index 2e93d8c..e5d1a83 100644
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -137,7 +137,7 @@
MagickBooleanType
status;
- PixelPacket
+ PixelInfo
pixel;
Quantum
diff --git a/coders/ttf.c b/coders/ttf.c
index 104e0ae..170d754 100644
--- a/coders/ttf.c
+++ b/coders/ttf.c
@@ -190,7 +190,7 @@
MagickBooleanType
status;
- PixelPacket
+ PixelInfo
background_color;
register ssize_t
@@ -237,7 +237,7 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelPacket(image,&background_color,q);
+ SetPixelPixelInfo(image,&background_color,q);
q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
diff --git a/coders/txt.c b/coders/txt.c
index 1b6e2d4..db0cda3 100644
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -373,7 +373,7 @@
y,
y_offset;
- PixelLongPacket
+ PixelInfo
pixel;
MagickBooleanType
@@ -454,19 +454,19 @@
if (image->colorspace == CMYKColorspace)
{
if (image->matte != MagickFalse)
- count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u,%u,%u",&x_offset,
- &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.black,
- &pixel.alpha);
+ count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf,%lf",
+ &x_offset,&y_offset,&pixel.red,&pixel.green,&pixel.blue,
+ &pixel.black,&pixel.alpha);
else
- count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u,%u",&x_offset,
+ count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf",&x_offset,
&y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.black);
}
else
if (image->matte != MagickFalse)
- count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u,%u",&x_offset,
+ count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf",&x_offset,
&y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.alpha);
else
- count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u",&x_offset,
+ count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf",&x_offset,
&y_offset,&pixel.red,&pixel.green,&pixel.blue);
if (count < 5)
continue;
diff --git a/coders/uil.c b/coders/uil.c
index 7a86a59..28003f3 100644
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -329,7 +329,7 @@
else
(void) FormatLocaleString(buffer,MaxTextExtent,
" color('%s',%s) = '%s'",name,
- GetPixelPacketIntensity(image->colormap+i) <
+ GetPixelInfoIntensity(image->colormap+i) <
((Quantum) QuantumRange/2) ? "background" : "foreground",symbol);
(void) WriteBlobString(image,buffer);
(void) FormatLocaleString(buffer,MaxTextExtent,"%s",
diff --git a/coders/wpg.c b/coders/wpg.c
index b8e784b..3c2719b 100644
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -295,7 +295,7 @@
{
index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
}
p++;
@@ -306,7 +306,7 @@
{
index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
}
p++;
@@ -324,19 +324,19 @@
{
index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p) & 0x3);
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
p++;
q+=GetPixelChannels(image);
}
@@ -344,21 +344,21 @@
{
index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
if ((image->columns % 4) >= 1)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
if ((image->columns % 4) >= 2)
{
index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
}
}
@@ -378,11 +378,11 @@
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f);
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p) & 0x0f);
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
p++;
q+=GetPixelChannels(image);
}
@@ -390,7 +390,7 @@
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f);
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
p++;
q+=GetPixelChannels(image);
}
@@ -407,7 +407,7 @@
{
index=ConstrainColormapIndex(image,*p);
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
p++;
q+=GetPixelChannels(image);
}
@@ -1108,7 +1108,7 @@
{
if (bpp < 24)
if ( (image->colors < (one << bpp)) && (bpp != 24) )
- image->colormap=(PixelPacket *) ResizeQuantumMemory(
+ image->colormap=(PixelInfo *) ResizeQuantumMemory(
image->colormap,(size_t) (one << bpp),
sizeof(*image->colormap));
}
@@ -1281,7 +1281,7 @@
{
if(bpp < 24)
if( image->colors<(one << bpp) && bpp!=24 )
- image->colormap=(PixelPacket *) ResizeQuantumMemory(
+ image->colormap=(PixelInfo *) ResizeQuantumMemory(
image->colormap,(size_t) (one << bpp),
sizeof(*image->colormap));
}
diff --git a/coders/xc.c b/coders/xc.c
index eadd53d..d15fe41 100644
--- a/coders/xc.c
+++ b/coders/xc.c
@@ -99,7 +99,7 @@
PixelInfo
color;
- PixelPacket
+ PixelInfo
pixel;
register ssize_t
@@ -145,7 +145,7 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelPacket(image,&pixel,q);
+ SetPixelPixelInfo(image,&pixel,q);
if (image->colorspace == CMYKColorspace)
SetPixelBlack(image,pixel.black,q);
q+=GetPixelChannels(image);
diff --git a/coders/xcf.c b/coders/xcf.c
index 2ad1663..e6caf55 100644
--- a/coders/xcf.c
+++ b/coders/xcf.c
@@ -168,7 +168,7 @@
green,
blue,
alpha;
-} XCFPixelPacket;
+} XCFPixelInfo;
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -349,12 +349,12 @@
unsigned char
*graydata;
- XCFPixelPacket
+ XCFPixelInfo
*xcfdata,
*xcfodata;
- xcfdata=(XCFPixelPacket *) AcquireQuantumMemory(data_length,sizeof(*xcfdata));
- if (xcfdata == (XCFPixelPacket *) NULL)
+ xcfdata=(XCFPixelInfo *) AcquireQuantumMemory(data_length,sizeof(*xcfdata));
+ if (xcfdata == (XCFPixelInfo *) NULL)
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
xcfodata=xcfdata;
@@ -398,7 +398,7 @@
if (SyncAuthenticPixels(tile_image,exception) == MagickFalse)
break;
}
- xcfodata=(XCFPixelPacket *) RelinquishMagickMemory(xcfodata);
+ xcfodata=(XCFPixelInfo *) RelinquishMagickMemory(xcfodata);
return MagickTrue;
}
diff --git a/coders/xpm.c b/coders/xpm.c
index 09ae938..1b16ce2 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);
- SetPixelPacket(image,image->colormap+j,r);
+ SetPixelPixelInfo(image,image->colormap+j,r);
p+=width;
r+=GetPixelChannels(image);
}
@@ -693,9 +693,9 @@
if (transparent != MagickFalse)
{
colors++;
- picon->colormap=(PixelPacket *) ResizeQuantumMemory((void **)
+ picon->colormap=(PixelInfo *) ResizeQuantumMemory((void **)
picon->colormap,(size_t) colors,sizeof(*picon->colormap));
- if (picon->colormap == (PixelPacket *) NULL)
+ if (picon->colormap == (PixelInfo *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationError");
for (y=0; y < (ssize_t) picon->rows; y++)
{
diff --git a/coders/xwd.c b/coders/xwd.c
index 1623e676..c5a3bd5 100644
--- a/coders/xwd.c
+++ b/coders/xwd.c
@@ -476,7 +476,7 @@
index=ConstrainColormapIndex(image,XGetPixel(ximage,(int) x,
(int) y));
SetPixelIndex(image,index,q);
- SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q);
q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)