diff --git a/coders/svg.c b/coders/svg.c
index 385ff0d..c526026 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -141,7 +141,7 @@
AffineMatrix
affine;
- unsigned long
+ size_t
width,
height;
@@ -375,7 +375,7 @@
*text,
**tokens;
- register long
+ register ssize_t
i;
SVGInfo
@@ -406,7 +406,7 @@
*p,
*q;
- register long
+ register ssize_t
i;
SVGInfo
@@ -792,7 +792,7 @@
SVGInfo
*svg_info;
- register long
+ register ssize_t
i,
j;
@@ -2114,8 +2114,8 @@
if ((svg_info->view_box.width == 0.0) ||
(svg_info->view_box.height == 0.0))
svg_info->view_box=svg_info->bounds;
- svg_info->width=(unsigned long) floor(svg_info->bounds.width+0.5);
- svg_info->height=(unsigned long) floor(svg_info->bounds.height+0.5);
+ svg_info->width=(size_t) floor(svg_info->bounds.width+0.5);
+ svg_info->height=(size_t) floor(svg_info->bounds.height+0.5);
MVGPrintf(svg_info->file,"viewbox 0 0 %lu %lu\n",svg_info->width,
svg_info->height);
sx=(double) svg_info->width/svg_info->view_box.width;
@@ -2401,7 +2401,7 @@
register char
*p;
- register long
+ register ssize_t
i;
SVGInfo
@@ -2411,7 +2411,7 @@
Receiving some characters from the parser.
*/
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " SAX.characters(%s,%lu)",c,(unsigned long) length);
+ " SAX.characters(%s,%lu)",c,(size_t) length);
svg_info=(SVGInfo *) context;
if (svg_info->text != (char *) NULL)
svg_info->text=(char *) ResizeQuantumMemory(svg_info->text,
@@ -2426,7 +2426,7 @@
if (svg_info->text == (char *) NULL)
return;
p=svg_info->text+strlen(svg_info->text);
- for (i=0; i < (long) length; i++)
+ for (i=0; i < (ssize_t) length; i++)
*p++=c[i];
*p='\0';
}
@@ -2687,7 +2687,7 @@
status,
unique_file;
- long
+ ssize_t
n;
SVGInfo
@@ -2750,13 +2750,13 @@
GError
*error;
- long
+ ssize_t
y;
PixelPacket
fill_color;
- register long
+ register ssize_t
x;
register PixelPacket
@@ -2843,12 +2843,12 @@
#else
p=gdk_pixbuf_get_pixels(pixel_info);
#endif
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
q=GetAuthenticPixels(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++)
{
#if defined(MAGICKCORE_CAIRO_DELEGATE)
fill_color.blue=ScaleCharToQuantum(*p++);
@@ -3042,10 +3042,10 @@
%
% The format of the RegisterSVGImage method is:
%
-% unsigned long RegisterSVGImage(void)
+% size_t RegisterSVGImage(void)
%
*/
-ModuleExport unsigned long RegisterSVGImage(void)
+ModuleExport size_t RegisterSVGImage(void)
{
char
version[MaxTextExtent];
@@ -3220,7 +3220,7 @@
char
*p;
- long
+ ssize_t
value;
value=strtol(point,&p,10);
@@ -3229,13 +3229,13 @@
static MagickBooleanType TraceSVGImage(Image *image)
{
- long
+ ssize_t
y;
register const PixelPacket
*p;
- register long
+ register ssize_t
x;
#if defined(MAGICKCORE_AUTOTRACE_DELEGATE)
@@ -3255,10 +3255,10 @@
ImageType
type;
- register long
+ register ssize_t
i;
- unsigned long
+ size_t
number_planes;
/*
@@ -3272,12 +3272,12 @@
number_planes=1;
trace=at_bitmap_new(image->columns,image->rows,number_planes);
i=0;
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
if (p == (const PixelPacket *) NULL)
break;
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
trace->bitmap[i++]=GetRedPixelComponent(p);
if (number_planes == 3)
@@ -3322,13 +3322,13 @@
"<svg width=\"%lu\" height=\"%lu\">\n",image->columns,image->rows);
(void) WriteBlobString(image,message);
GetMagickPixelPacket(image,&pixel);
- for (y=0; y < (long) image->rows; y++)
+ for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
if (p == (const PixelPacket *) NULL)
break;
indexes=GetVirtualIndexQueue(image);
- for (x=0; x < (long) image->columns; x++)
+ for (x=0; x < (ssize_t) image->columns; x++)
{
SetMagickPixelPacket(image,p,indexes+x,&pixel);
(void) QueryMagickColorname(image,&pixel,SVGCompliance,tuple,
@@ -3367,7 +3367,7 @@
int
n;
- long
+ ssize_t
j;
MagickBooleanType
@@ -3383,10 +3383,10 @@
PrimitiveType
primitive_type;
- register long
+ register ssize_t
x;
- register long
+ register ssize_t
i;
size_t
@@ -3395,7 +3395,7 @@
SVGInfo
svg_info;
- unsigned long
+ size_t
number_points;
/*
@@ -3993,7 +3993,7 @@
{
if (IsPoint(q))
{
- long
+ ssize_t
k;
p=q;
@@ -4158,7 +4158,7 @@
primitive_info[i].coordinates=0;
primitive_info[i].method=FloodfillMethod;
i++;
- if (i < (long) (number_points-6*BezierQuantum-360))
+ if (i < (ssize_t) (number_points-6*BezierQuantum-360))
continue;
number_points+=6*BezierQuantum+360;
primitive_info=(PrimitiveInfo *) ResizeQuantumMemory(primitive_info,
@@ -4354,7 +4354,7 @@
for (p=token; *p != '\0'; p++)
if (isalpha((int) *p))
number_attributes++;
- if (i > (long) (number_points-6*BezierQuantum*number_attributes-1))
+ if (i > (ssize_t) (number_points-6*BezierQuantum*number_attributes-1))
{
number_points+=6*BezierQuantum*number_attributes;
primitive_info=(PrimitiveInfo *) ResizeQuantumMemory(primitive_info,
