operand,
status;
- long
+ ssize_t
y;
MagickStatusType
register IndexPacket
*indexes;
- register long
+ register ssize_t
x;
register PixelPacket
*q;
- register long
+ register ssize_t
i;
register unsigned char
plane,
*rle_pixels;
- unsigned long
+ size_t
bits_per_pixel,
map_length,
number_colormaps,
- number_planes;
+ number_planes,
+ one;
/*
Open image file.
number_planes=1UL*ReadBlobByte(image);
bits_per_pixel=1UL*ReadBlobByte(image);
number_colormaps=1UL*ReadBlobByte(image);
- map_length=1UL << ReadBlobByte(image);
+ one=1;
+ map_length=one << ReadBlobByte(image);
if ((number_planes == 0) || (number_planes == 2) || (bits_per_pixel != 8) ||
(image->columns == 0))
ThrowReaderException(CorruptImageError,"ImproperImageHeader");
/*
No background color-- initialize to black.
*/
- for (i=0; i < (long) number_planes; i++)
+ for (i=0; i < (ssize_t) number_planes; i++)
background_color[i]=0;
(void) ReadBlobByte(image);
}
Initialize background color.
*/
p=background_color;
- for (i=0; i < (long) number_planes; i++)
+ for (i=0; i < (ssize_t) number_planes; i++)
*p++=(unsigned char) ReadBlobByte(image);
}
if ((number_planes & 0x01) == 0)
if (colormap == (unsigned char *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
p=colormap;
- for (i=0; i < (long) number_colormaps; i++)
- for (x=0; x < (long) map_length; x++)
+ for (i=0; i < (ssize_t) number_colormaps; i++)
+ for (x=0; x < (ssize_t) map_length; x++)
*p++=(unsigned char) ScaleShortToQuantum(ReadBlobLSBShort(image));
}
if ((flags & 0x08) != 0)
char
*comment;
- unsigned long
+ size_t
length;
/*
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
if ((flags & 0x01) && !(flags & 0x02))
{
- long
+ ssize_t
j;
/*
Set background color.
*/
p=rle_pixels;
- for (i=0; i < (long) number_pixels; i++)
+ for (i=0; i < (ssize_t) number_pixels; i++)
{
if (image->matte == MagickFalse)
- for (j=0; j < (long) number_planes; j++)
+ for (j=0; j < (ssize_t) number_planes; j++)
*p++=background_color[j];
else
{
- for (j=0; j < (long) (number_planes-1); j++)
+ for (j=0; j < (ssize_t) (number_planes-1); j++)
*p++=background_color[j];
*p++=0; /* initialize matte channel */
}
p=rle_pixels+((image->rows-y-1)*image->columns*number_planes)+
x*number_planes+plane;
operand++;
- for (i=0; i < (long) operand; i++)
+ for (i=0; i < (ssize_t) operand; i++)
{
pixel=(unsigned char) ReadBlobByte(image);
- if ((y < (long) image->rows) && ((x+i) < (long) image->columns))
+ if ((y < (ssize_t) image->rows) && ((x+i) < (ssize_t) image->columns))
*p=pixel;
p+=number_planes;
}
operand++;
p=rle_pixels+((image->rows-y-1)*image->columns*number_planes)+
x*number_planes+plane;
- for (i=0; i < (long) operand; i++)
+ for (i=0; i < (ssize_t) operand; i++)
{
- if ((y < (long) image->rows) && ((x+i) < (long) image->columns))
+ if ((y < (ssize_t) image->rows) && ((x+i) < (ssize_t) image->columns))
*p=pixel;
p+=number_planes;
}
mask=(MagickStatusType) (map_length-1);
p=rle_pixels;
if (number_colormaps == 1)
- for (i=0; i < (long) number_pixels; i++)
+ for (i=0; i < (ssize_t) number_pixels; i++)
{
*p=colormap[*p & mask];
p++;
}
else
if ((number_planes >= 3) && (number_colormaps >= 3))
- for (i=0; i < (long) number_pixels; i++)
- for (x=0; x < (long) number_planes; x++)
+ for (i=0; i < (ssize_t) number_pixels; i++)
+ for (x=0; x < (ssize_t) number_planes; x++)
{
*p=colormap[x*map_length+(*p & mask)];
p++;
Convert raster image to DirectClass pixel packets.
*/
p=rle_pixels;
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (PixelPacket *) NULL)
break;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
q->red=ScaleCharToQuantum(*p++);
q->green=ScaleCharToQuantum(*p++);
break;
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,LoadImageTag,y,image->rows);
+ status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
p=colormap;
if (number_colormaps == 1)
- for (i=0; i < (long) image->colors; i++)
+ for (i=0; i < (ssize_t) image->colors; i++)
{
/*
Pseudocolor.
}
else
if (number_colormaps > 1)
- for (i=0; i < (long) image->colors; i++)
+ for (i=0; i < (ssize_t) image->colors; i++)
{
image->colormap[i].red=ScaleCharToQuantum(*p);
image->colormap[i].green=ScaleCharToQuantum(*(p+map_length));
/*
Convert raster image to PseudoClass pixel packets.
*/
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (PixelPacket *) NULL)
break;
indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
indexes[x]=(IndexPacket) (*p++);
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,LoadImageTag,y,image->rows);
+ status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
/*
Image has a matte channel-- promote to DirectClass.
*/
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (PixelPacket *) NULL)
break;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
q->red=image->colormap[*p++].red;
q->green=image->colormap[*p++].green;
break;
if (image->previous == (Image *) NULL)
{
- status=SetImageProgress(image,LoadImageTag,y,image->rows);
+ status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
%
% The format of the RegisterRLEImage method is:
%
-% unsigned long RegisterRLEImage(void)
+% size_t RegisterRLEImage(void)
%
*/
-ModuleExport unsigned long RegisterRLEImage(void)
+ModuleExport size_t RegisterRLEImage(void)
{
MagickInfo
*entry;