From: cristy Date: Fri, 28 May 2010 19:19:36 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9374 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2faecf9facdbbb14fcba373365f9f691a9658e0;p=imagemagick --- diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index 20813f487..eb20fd634 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -927,7 +927,7 @@ static Image *GetList(pTHX_ SV *reference,SV ***reference_vector,ssize_t *curren break; } (void) fprintf(stderr,"GetList: UnrecognizedType %ld\n", - (ssize_t) SvTYPE(reference)); + (long) SvTYPE(reference)); return((Image *) NULL); } @@ -971,7 +971,7 @@ static struct PackageInfo *GetPackageInfo(pTHX_ void *reference, *sv; (void) FormatMagickString(message,MaxTextExtent,"%s::package%s%lx", - PackageName,XS_VERSION,(ssize_t) reference); + PackageName,XS_VERSION,(long) reference); sv=perl_get_sv(message,(TRUE | 0x02)); if (sv == (SV *) NULL) { @@ -1063,7 +1063,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image, ssize_t sp; - ssize_t + long x, y; @@ -1229,7 +1229,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image, int items; - ssize_t + long i; if (image->storage_class == DirectClass) @@ -1558,7 +1558,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image, int items; - ssize_t + long index; register PixelPacket @@ -3413,7 +3413,7 @@ DESTROY(ref) Array (AV *) reference */ (void) FormatMagickString(message,MaxTextExtent,"package%s%lx", - XS_VERSION,(ssize_t) reference); + XS_VERSION,(unsigned long) reference); hv=gv_stashpv(PackageName, FALSE); if (!hv) break; @@ -4185,7 +4185,7 @@ Get(ref,...) Image *image; - ssize_t + long j; register ssize_t @@ -4355,7 +4355,8 @@ Get(ref,...) break; page=GetImageBoundingBox(image,&image->exception); (void) FormatMagickString(geometry,MaxTextExtent, - "%lux%lu%+ld%+ld",page.width,page.height,page.x,page.y); + "%lux%lu%+ld%+ld",(unsigned long) page.width,(unsigned long) + page.height,(long) page.x,(long) page.y); s=newSVpv(geometry,0); PUSHs(s ? sv_2mortal(s) : &sv_undef); continue; @@ -4764,7 +4765,8 @@ Get(ref,...) static ssize_t id = 0; - (void) FormatMagickString(key,MaxTextExtent,"%ld\n",id); + (void) FormatMagickString(key,MaxTextExtent,"%ld\n",(long) + id); status=SetImageRegistry(ImageRegistryType,key,image, &image->exception); s=newSViv(id++); @@ -4780,7 +4782,7 @@ Get(ref,...) int items; - ssize_t + long x, y; @@ -5015,8 +5017,9 @@ Get(ref,...) geometry[MaxTextExtent]; (void) FormatMagickString(geometry,MaxTextExtent, - "%lux%lu%+ld%+ld",image->page.width,image->page.height, - image->page.x,image->page.y); + "%lux%lu%+ld%+ld",(unsigned long) image->page.width, + (unsigned long) image->page.height,(long) image->page.x, + (long) image->page.y); s=newSVpv(geometry,0); } PUSHs(s ? sv_2mortal(s) : &sv_undef); @@ -5044,7 +5047,7 @@ Get(ref,...) int items; - ssize_t + long x, y; @@ -5987,7 +5990,7 @@ Histogram(ref,...) histogram[i].pixel.opacity); PUSHs(sv_2mortal(newSVpv(message,0))); (void) FormatMagickString(message,MaxTextExtent,"%lu", - (size_t) histogram[i].count); + (unsigned long) histogram[i].count); PUSHs(sv_2mortal(newSVpv(message,0))); } histogram=(ColorPacket *) RelinquishMagickMemory(histogram); @@ -7457,7 +7460,7 @@ Mogrify(ref,...) { default: { - (void) FormatMagickString(message,MaxTextExtent,"%ld",(ssize_t) ix); + (void) FormatMagickString(message,MaxTextExtent,"%ld",(long) ix); ThrowPerlException(exception,OptionError, "UnrecognizedPerlMagickMethod",message); goto PerlException; @@ -8307,8 +8310,9 @@ Mogrify(ref,...) Composite two images (normal composition). */ (void) FormatMagickString(composite_geometry,MaxTextExtent, - "%lux%lu%+ld%+ld",composite_image->columns,composite_image->rows, - geometry.x,geometry.y); + "%lux%lu%+ld%+ld",(unsigned long) composite_image->columns, + (unsigned long) composite_image->rows,(long) geometry.x,(long) + geometry.y); flags=ParseGravityGeometry(image,composite_geometry,&geometry, exception); if (attribute_flag[8] == 0) /* no rotate */ @@ -8321,7 +8325,8 @@ Mogrify(ref,...) */ geometry.x-=(ssize_t) (rotate_image->columns- composite_image->columns)/2; - geometry.y-=(ssize_t) (rotate_image->rows-composite_image->rows)/2; + geometry.y-=(ssize_t) (rotate_image->rows- + composite_image->rows)/2; CompositeImageChannel(image,channel,compose,rotate_image, geometry.x,geometry.y); rotate_image=DestroyImage(rotate_image); @@ -11727,7 +11732,8 @@ QueryFont(ref,...) else PUSHs(sv_2mortal(newSVpv(MagickOptionToMnemonic(MagickStretchOptions, type_info->stretch),0))); - (void) FormatMagickString(message,MaxTextExtent,"%lu",type_info->weight); + (void) FormatMagickString(message,MaxTextExtent,"%lu",(unsigned long) + type_info->weight); PUSHs(sv_2mortal(newSVpv(message,0))); if (type_info->encoding == (char *) NULL) PUSHs(&sv_undef); @@ -13283,7 +13289,7 @@ Statistics(ref,...) #define ChannelStatistics(channel) \ { \ (void) FormatMagickString(message,MaxTextExtent,"%lu", \ - channel_statistics[channel].depth); \ + (unsigned long) channel_statistics[channel].depth); \ PUSHs(sv_2mortal(newSVpv(message,0))); \ (void) FormatMagickString(message,MaxTextExtent,"%.15g", \ channel_statistics[channel].minima/scale); \ diff --git a/coders/bmp.c b/coders/bmp.c index ce3f5d36f..028046ab7 100644 --- a/coders/bmp.c +++ b/coders/bmp.c @@ -620,7 +620,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Format: OS/2 Bitmap"); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Geometry: %ldx%ld",bmp_info.width,bmp_info.height); + " Geometry: %lux%lu",(unsigned long) bmp_info.width, + (unsigned long) bmp_info.height); } } else @@ -647,9 +648,10 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Format: MS Windows bitmap"); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Geometry: %ldx%ld",bmp_info.width,bmp_info.height); + " Geometry: %lux%lu",(unsigned long) bmp_info.width, + (unsigned long) bmp_info.height); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Bits per pixel: %d",bmp_info.bits_per_pixel); + " Bits per pixel: %lu",(unsigned long) bmp_info.bits_per_pixel); switch ((int) bmp_info.compression) { case BI_RGB: @@ -851,7 +853,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) */ if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Reading colormap of %ld colors",image->colors); + " Reading colormap of %lu colors",(unsigned long) image->colors); if (AcquireImageColormap(image,image->colors) == MagickFalse) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); bmp_colormap=(unsigned char *) AcquireQuantumMemory((size_t) @@ -901,7 +903,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) { if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Reading pixels (%ld bytes)",(ssize_t) length); + " Reading pixels (%lu bytes)",(unsigned long) length); count=ReadBlob(image,length,pixels); if (count != (ssize_t) length) ThrowReaderException(CorruptImageError,"InsufficientImageDataInFile"); @@ -1824,7 +1826,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image) if (image->debug != MagickFalse) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Writing BMP version %ld datastream",type); + " Writing BMP version %ld datastream",(long) type); if (image->storage_class == DirectClass) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Storage class=DirectClass"); @@ -1832,7 +1834,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Storage class=PseudoClass"); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Image depth=%lu",image->depth); + " Image depth=%lu",(unsigned long) image->depth); if (image->matte != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Matte=True"); @@ -1840,7 +1842,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Matte=MagickFalse"); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " BMP bits_per_pixel=%d",bmp_info.bits_per_pixel); + " BMP bits_per_pixel=%lu",(unsigned long) bmp_info.bits_per_pixel); switch ((int) bmp_info.compression) { case BI_RGB: @@ -1995,7 +1997,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image) */ if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Colormap: %ld entries",image->colors); + " Colormap: %lu entries",(unsigned long) image->colors); bmp_colormap=(unsigned char *) AcquireQuantumMemory((size_t) (1UL << bmp_info.bits_per_pixel),4*sizeof(*bmp_colormap)); if (bmp_colormap == (unsigned char *) NULL) diff --git a/coders/braille.c b/coders/braille.c index d0d2dd8ad..d3753774a 100644 --- a/coders/braille.c +++ b/coders/braille.c @@ -228,21 +228,21 @@ static MagickBooleanType WriteBRAILLEImage(const ImageInfo *image_info, } if (image->page.x) { - (void) FormatMagickString(buffer,MaxTextExtent,"X: %ld\n", + (void) FormatMagickString(buffer,MaxTextExtent,"X: %ld\n",(long) image->page.x); (void) WriteBlobString(image,buffer); } if (image->page.y) { - (void) FormatMagickString(buffer,MaxTextExtent,"Y: %ld\n", + (void) FormatMagickString(buffer,MaxTextExtent,"Y: %ld\n",(long) image->page.y); (void) WriteBlobString(image,buffer); } (void) FormatMagickString(buffer,MaxTextExtent,"Width: %lu\n", - image->columns+(image->columns % 2)); + (unsigned long) (image->columns+(image->columns % 2))); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"Height: %lu\n", - image->rows); + (unsigned long) image->rows); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"\n"); } diff --git a/coders/cals.c b/coders/cals.c index 75d3f9737..20c4b1b0c 100644 --- a/coders/cals.c +++ b/coders/cals.c @@ -166,7 +166,7 @@ static Image *ReadCALSImage(const ImageInfo *image_info, register ssize_t i; - size_t + unsigned long density, direction, height, @@ -532,10 +532,10 @@ static MagickBooleanType WriteCALSImage(const ImageInfo *image_info, } } (void) FormatMagickString(header,MaxTextExtent,"rorient: %03ld,%03ld", - orient_x,orient_y); + (long) orient_x,(long) orient_y); count=WriteCALSRecord(image,header); (void) FormatMagickString(header,MaxTextExtent,"rpelcnt: %06lu,%06lu", - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); count=WriteCALSRecord(image,header); density=200; if (image_info->density != (char *) NULL) @@ -546,7 +546,8 @@ static MagickBooleanType WriteCALSImage(const ImageInfo *image_info, (void) ParseGeometry(image_info->density,&geometry_info); density=(size_t) floor(geometry_info.rho+0.5); } - (void) FormatMagickString(header,MaxTextExtent,"rdensty: %04lu",density); + (void) FormatMagickString(header,MaxTextExtent,"rdensty: %04lu", + (unsigned long) density); count=WriteCALSRecord(image,header); count=WriteCALSRecord(image,"notes: NONE"); (void) ResetMagickMemory(header,' ',128); diff --git a/coders/cin.c b/coders/cin.c index dcd556373..5b2ae4540 100644 --- a/coders/cin.c +++ b/coders/cin.c @@ -585,12 +585,12 @@ static Image *ReadCINImage(const ImageInfo *image_info, offset+=4; if ((size_t) cin.origination.x_offset != ~0UL) (void) FormatImageProperty(image,"cin:origination.x_offset","%ld", - cin.origination.x_offset); + (long) cin.origination.x_offset); cin.origination.y_offset=(ssize_t) ReadBlobLong(image); offset+=4; if ((size_t) cin.origination.y_offset != ~0UL) (void) FormatImageProperty(image,"cin:origination.y_offset","%ld", - cin.origination.y_offset); + (long) cin.origination.y_offset); offset+=ReadBlob(image,sizeof(cin.origination.filename),(unsigned char *) cin.origination.filename); (void) SetImageProperty(image,"cin:origination.filename", @@ -647,7 +647,7 @@ static Image *ReadCINImage(const ImageInfo *image_info, cin.film.prefix=ReadBlobLong(image); offset+=4; if (cin.film.prefix != ~0UL) - (void) FormatImageProperty(image,"cin:film.prefix","%lu", + (void) FormatImageProperty(image,"cin:film.prefix","%lu",(unsigned long) cin.film.prefix); cin.film.count=ReadBlobLong(image); offset+=4; @@ -658,7 +658,7 @@ static Image *ReadCINImage(const ImageInfo *image_info, offset+=4; if (cin.film.frame_position != ~0UL) (void) FormatImageProperty(image,"cin:film.frame_position","%lu", - cin.film.frame_position); + (unsigned long) cin.film.frame_position); cin.film.frame_rate=ReadBlobFloat(image); offset+=4; if (IsFloatDefined(cin.film.frame_rate) != MagickFalse) diff --git a/coders/cip.c b/coders/cip.c index 739457ccd..ce7f9730e 100644 --- a/coders/cip.c +++ b/coders/cip.c @@ -213,16 +213,16 @@ static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image) } (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"%ld\n", - image->page.x); + (long) image->page.x); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"%ld\n", - image->page.y); + (long) image->page.y); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n", - image->columns+(image->columns % 2)); + (unsigned long) (image->columns+(image->columns % 2))); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n", - image->rows); + (unsigned long) image->rows); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"2\n"); (void) WriteBlobString(image,buffer); diff --git a/coders/dcm.c b/coders/dcm.c index fff025bab..36926650d 100644 --- a/coders/dcm.c +++ b/coders/dcm.c @@ -3022,8 +3022,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) (element == (ssize_t) dicom_info[i].element)) break; (void) fprintf(stdout,"0x%04lX %4ld %s-%s (0x%04lx,0x%04lx)", - (size_t) image->offset,(ssize_t) length,implicit_vr, - explicit_vr,(size_t) group,(size_t) element); + (unsigned long) image->offset,(long) length,implicit_vr, + explicit_vr,(unsigned long) group,(unsigned long) element); if (dicom_info[i].description != (char *) NULL) (void) fprintf(stdout," %s",dicom_info[i].description); (void) fprintf(stdout,": "); diff --git a/coders/dpx.c b/coders/dpx.c index 971ed93c7..2e802600a 100644 --- a/coders/dpx.c +++ b/coders/dpx.c @@ -900,18 +900,18 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) dpx.television.interlace=(unsigned char) ReadBlobByte(image); offset++; if (dpx.television.interlace != 0) - (void) FormatImageProperty(image,"dpx:television.interlace","%ld",(ssize_t) - dpx.television.interlace); + (void) FormatImageProperty(image,"dpx:television.interlace","%ld", + (long) dpx.television.interlace); dpx.television.field_number=(unsigned char) ReadBlobByte(image); offset++; if (dpx.television.field_number != 0) (void) FormatImageProperty(image,"dpx:television.field_number","%ld", - (ssize_t) dpx.television.field_number); + (long) dpx.television.field_number); dpx.television.video_signal=(unsigned char) ReadBlobByte(image); offset++; if (dpx.television.video_signal != 0) (void) FormatImageProperty(image,"dpx:television.video_signal","%ld", - (ssize_t) dpx.television.video_signal); + (long) dpx.television.video_signal); dpx.television.padding=(unsigned char) ReadBlobByte(image); offset++; if (dpx.television.padding != 0) diff --git a/coders/fits.c b/coders/fits.c index c9ce09e02..ed546ff69 100644 --- a/coders/fits.c +++ b/coders/fits.c @@ -658,7 +658,8 @@ static MagickBooleanType WriteFITSImage(const ImageInfo *image_info, (void) strncpy(fits_info+offset,header,strlen(header)); offset+=80; (void) FormatMagickString(header,FITSBlocksize,"BITPIX = %10ld", - (quantum_info->format == FloatingPointQuantumFormat ? -1 : 1)*image->depth); + (long) (quantum_info->format == FloatingPointQuantumFormat ? -1 : 1)* + image->depth); (void) strncpy(fits_info+offset,header,strlen(header)); offset+=80; (void) FormatMagickString(header,FITSBlocksize,"NAXIS = %10lu", @@ -666,11 +667,11 @@ static MagickBooleanType WriteFITSImage(const ImageInfo *image_info, (void) strncpy(fits_info+offset,header,strlen(header)); offset+=80; (void) FormatMagickString(header,FITSBlocksize,"NAXIS1 = %10lu", - image->columns); + (unsigned long) image->columns); (void) strncpy(fits_info+offset,header,strlen(header)); offset+=80; (void) FormatMagickString(header,FITSBlocksize,"NAXIS2 = %10lu", - image->rows); + (unsigned long) image->rows); (void) strncpy(fits_info+offset,header,strlen(header)); offset+=80; (void) FormatMagickString(header,FITSBlocksize,"BSCALE = %E",1.0); diff --git a/coders/html.c b/coders/html.c index 1fc0ca6b3..c2442bdb1 100644 --- a/coders/html.c +++ b/coders/html.c @@ -341,7 +341,8 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, { (void) FormatMagickString(buffer,MaxTextExtent, "%s\" shape=\"rect\" coords=\"0,0,%lu,%lu\" alt=\"\" />\n", - image->filename,geometry.width-1,geometry.height-1); + image->filename,(unsigned long) geometry.width-1,(unsigned long) + geometry.height-1); (void) WriteBlobString(image,buffer); } else @@ -352,8 +353,8 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, { (void) FormatMagickString(buffer,MaxTextExtent, "\" shape=\"rect\" coords=\"%ld,%ld,%ld,%ld\" alt=\"\" />\n", - geometry.x,geometry.y,geometry.x+(ssize_t) geometry.width-1, - geometry.y+(ssize_t) geometry.height-1); + (long) geometry.x,(long) geometry.y,(long) (geometry.x+ + geometry.width-1),(long) (geometry.y+geometry.height-1)); (void) WriteBlobString(image,buffer); if (*(p+1) != '\0') { @@ -416,7 +417,8 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, { (void) FormatMagickString(buffer,MaxTextExtent, "%s\" shape=\"rect\" coords=\"0,0,%lu,%lu\" alt=\"\" />\n", - image->filename,geometry.width-1,geometry.height-1); + image->filename,(unsigned long) geometry.width-1,(unsigned long) + geometry.height-1); (void) WriteBlobString(image,buffer); } else @@ -427,8 +429,8 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, { (void) FormatMagickString(buffer,MaxTextExtent, "\" shape=\"rect\" coords=\"%ld,%ld,%ld,%ld\" alt=\"\" />\n", - geometry.x,geometry.y,geometry.x+(ssize_t) geometry.width-1, - geometry.y+(ssize_t) geometry.height-1); + (long) geometry.x,(long) geometry.y,geometry.x+(long) + geometry.width-1,geometry.y+(long) geometry.height-1); (void) WriteBlobString(image,buffer); if (*(p+1) != '\0') { diff --git a/coders/icon.c b/coders/icon.c index 2e715b3bd..d8c27c876 100644 --- a/coders/icon.c +++ b/coders/icon.c @@ -324,19 +324,19 @@ static Image *ReadICONImage(const ImageInfo *image_info, if (image->debug != MagickFalse) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " scene = %ld",i); + " scene = %lu",(unsigned long) i); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " size = %ld",icon_info.size); + " size = %lu",(unsigned long) icon_info.size); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " width = %d",icon_file.directory[i].width); + " width = %lu",(unsigned long) icon_file.directory[i].width); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " height = %d",icon_file.directory[i].height); + " height = %lu",(unsigned long) icon_file.directory[i].height); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " colors = %ld",icon_info.number_colors); + " colors = %lu",(unsigned long ) icon_info.number_colors); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " planes = %d",icon_info.planes); + " planes = %lu",(unsigned long) icon_info.planes); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " bpp = %d",icon_info.bits_per_pixel); + " bpp = %lu",(unsigned long) icon_info.bits_per_pixel); } if ((icon_info.number_colors != 0) || (icon_info.bits_per_pixel <= 16)) { diff --git a/coders/jpeg.c b/coders/jpeg.c index 1d09810f5..ca358ccca 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -432,7 +432,7 @@ static boolean ReadICCProfile(j_decompress_ptr jpeg_info) } if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Profile: ICC, %lu bytes",(size_t) length); + "Profile: ICC, %lu bytes",(unsigned long) length); return(MagickTrue); } @@ -528,7 +528,7 @@ static boolean ReadIPTCProfile(j_decompress_ptr jpeg_info) } if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Profile: iptc, %lu bytes",(size_t) length); + "Profile: iptc, %lu bytes",(unsigned long) length); return(MagickTrue); } @@ -612,11 +612,11 @@ static boolean ReadProfile(j_decompress_ptr jpeg_info) image->filename); if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Profile: %s, %lu bytes",name,(size_t) length); + "Profile: %s, %lu bytes",name,(unsigned long) length); return(MagickTrue); } -static void SkipInputData(j_decompress_ptr cinfo,ssize_t number_bytes) +static void SkipInputData(j_decompress_ptr cinfo,long number_bytes) { SourceManager *source; @@ -626,7 +626,7 @@ static void SkipInputData(j_decompress_ptr cinfo,ssize_t number_bytes) source=(SourceManager *) cinfo->src; while (number_bytes > (ssize_t) source->manager.bytes_in_buffer) { - number_bytes-=(ssize_t) source->manager.bytes_in_buffer; + number_bytes-=(long) source->manager.bytes_in_buffer; (void) FillInputBuffer(cinfo); } source->manager.next_input_byte+=(size_t) number_bytes; @@ -737,7 +737,7 @@ static void JPEGSetImageQuality(struct jpeg_decompress_struct *jpeg_info, image->quality=(size_t) i+1; if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Quality: %ld (%s)",i+1,(qvalue <= hash[i]) && + "Quality: %ld (%s)",(long) i+1,(qvalue <= hash[i]) && (sum <= sums[i]) ? "exact" : "approximate"); break; } @@ -786,7 +786,7 @@ static void JPEGSetImageQuality(struct jpeg_decompress_struct *jpeg_info, image->quality=(size_t) i+1; if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Quality: %ld (%s)",i+1,(qvalue <= hash[i]) && + "Quality: %ld (%s)",(long) i+1,(qvalue <= hash[i]) && (sum <= sums[i]) ? "exact" : "approximate"); break; } @@ -1015,7 +1015,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, jpeg_calc_output_dimensions(&jpeg_info); if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(),"Scale factor: %ld", - (ssize_t) scale_factor); + (long) scale_factor); } precision=(size_t) jpeg_info.data_precision; #if (JPEG_LIB_VERSION >= 61) && defined(D_PROGRESSIVE_SUPPORTED) @@ -1127,7 +1127,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, } JPEGSetImageQuality(&jpeg_info,image); JPEGSetImageSamplingFactor(&jpeg_info,image); - (void) FormatMagickString(value,MaxTextExtent,"%ld",(ssize_t) + (void) FormatMagickString(value,MaxTextExtent,"%ld",(long) jpeg_info.out_color_space); (void) SetImageProperty(image,"jpeg:colorspace",value); if (image_info->ping != MagickFalse) @@ -1591,7 +1591,7 @@ static void WriteProfile(j_compress_ptr jpeg_info,Image *image) xmp_profile=DestroyStringInfo(xmp_profile); } (void) LogMagickEvent(CoderEvent,GetMagickModule(),"%s profile: %lu bytes", - name,(size_t) GetStringInfoLength(profile)); + name,(unsigned long) GetStringInfoLength(profile)); name=GetNextImageProfile(image); } custom_profile=DestroyStringInfo(custom_profile); @@ -1780,8 +1780,8 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info, jpeg_info.density_unit=(UINT8) 1; if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Image resolution: %ld,%ld",(ssize_t) floor(image->x_resolution+0.5), - (ssize_t) floor(image->y_resolution+0.5)); + "Image resolution: %ld,%ld",(long) floor(image->x_resolution+0.5), + (long) floor(image->y_resolution+0.5)); if ((image->x_resolution != 0.0) && (image->y_resolution != 0.0)) { /* @@ -1920,7 +1920,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info, jpeg_set_quality(&jpeg_info,(int) image->quality,MagickTrue); if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(),"Quality: %lu", - image->quality); + (unsigned long) image->quality); } else { @@ -2026,10 +2026,10 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info, (void) LogMagickEvent(CoderEvent,GetMagickModule(), "Storage class: DirectClass"); (void) LogMagickEvent(CoderEvent,GetMagickModule(),"Depth: %lu", - image->depth); + (unsigned long) image->depth); if (image->colors != 0) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Number of colors: %lu",image->colors); + "Number of colors: %lu",(unsigned long) image->colors); else (void) LogMagickEvent(CoderEvent,GetMagickModule(), "Number of colors: unspecified"); diff --git a/coders/mat.c b/coders/mat.c index 7106691e6..65b163b5d 100644 --- a/coders/mat.c +++ b/coders/mat.c @@ -746,8 +746,9 @@ MATLAB_KO: ThrowReaderException(CorruptImageError,"ImproperImageHeader"); } CellType = ReadBlobXXXLong(image2); /* Additional object type */ - if (logging) (void)LogMagickEvent(CoderEvent,GetMagickModule(), - "MATLAB_HDR.CellType: %ld",CellType); + if (logging) + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + "MATLAB_HDR.CellType: %ld",(long) CellType); (void) ReadBlob(image2, 4, (unsigned char *) &size); /* data size */ diff --git a/coders/miff.c b/coders/miff.c index 399326ee5..1bf55e16a 100644 --- a/coders/miff.c +++ b/coders/miff.c @@ -1819,11 +1819,12 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, (void) WriteBlobString(image,"id=ImageMagick version=1.0\n"); (void) FormatMagickString(buffer,MaxTextExtent, "class=%s colors=%lu matte=%s\n",MagickOptionToMnemonic( - MagickClassOptions,image->storage_class),image->colors, - MagickOptionToMnemonic(MagickBooleanOptions,(ssize_t) image->matte)); + MagickClassOptions,image->storage_class),(unsigned long) image->colors, + MagickOptionToMnemonic(MagickBooleanOptions,(long) image->matte)); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"columns=%lu rows=%lu " - "depth=%lu\n",image->columns,image->rows,image->depth); + "depth=%lu\n",(unsigned long) image->columns,(unsigned long) image->rows, + (unsigned long) image->depth); (void) WriteBlobString(image,buffer); if (image->type != UndefinedType) { @@ -1841,7 +1842,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, { (void) FormatMagickString(buffer,MaxTextExtent,"compression=%s " "quality=%lu\n",MagickOptionToMnemonic(MagickCompressOptions, - compression),image->quality); + compression),(unsigned long) image->quality); (void) WriteBlobString(image,buffer); } if (image->units != UndefinedResolution) @@ -1859,20 +1860,21 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, if ((image->page.width != 0) || (image->page.height != 0)) { (void) FormatMagickString(buffer,MaxTextExtent,"page=%lux%lu%+ld%+ld\n", - image->page.width,image->page.height,image->page.x,image->page.y); + (unsigned long) image->page.width,(unsigned long) image->page.height, + (long) image->page.x,(long) image->page.y); (void) WriteBlobString(image,buffer); } else if ((image->page.x != 0) || (image->page.y != 0)) { (void) FormatMagickString(buffer,MaxTextExtent,"page=%+ld%+ld\n", - image->page.x,image->page.y); + (long) image->page.x,(long) image->page.y); (void) WriteBlobString(image,buffer); } if ((image->tile_offset.x != 0) || (image->tile_offset.y != 0)) { (void) FormatMagickString(buffer,MaxTextExtent,"tile-offset=%+ld%+ld\n", - image->tile_offset.x,image->tile_offset.y); + (long) image->tile_offset.x,(long) image->tile_offset.y); (void) WriteBlobString(image,buffer); } if ((GetNextImageInList(image) != (Image *) NULL) || @@ -1880,12 +1882,14 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, { if (image->scene == 0) (void) FormatMagickString(buffer,MaxTextExtent,"iterations=%lu " - "delay=%lu ticks-per-second=%lu\n",image->iterations,image->delay, + "delay=%lu ticks-per-second=%lu\n",(unsigned long) + image->iterations,(unsigned long) image->delay,(unsigned long) image->ticks_per_second); else (void) FormatMagickString(buffer,MaxTextExtent,"scene=%lu " - "iterations=%lu delay=%lu ticks-per-second=%lu\n",image->scene, - image->iterations,image->delay,image->ticks_per_second); + "iterations=%lu delay=%lu ticks-per-second=%lu\n",(unsigned long) + image->scene,(unsigned long) image->iterations,(unsigned long) + image->delay,(unsigned long) image->ticks_per_second); (void) WriteBlobString(image,buffer); } else @@ -1893,25 +1897,25 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, if (image->scene != 0) { (void) FormatMagickString(buffer,MaxTextExtent,"scene=%lu\n", - image->scene); + (unsigned long) image->scene); (void) WriteBlobString(image,buffer); } if (image->iterations != 0) { (void) FormatMagickString(buffer,MaxTextExtent,"iterations=%lu\n", - image->iterations); + (unsigned long) image->iterations); (void) WriteBlobString(image,buffer); } if (image->delay != 0) { (void) FormatMagickString(buffer,MaxTextExtent,"delay=%lu\n", - image->delay); + (unsigned long) image->delay); (void) WriteBlobString(image,buffer); } if (image->ticks_per_second != UndefinedTicksPerSecond) { (void) FormatMagickString(buffer,MaxTextExtent, - "ticks-per-second=%lu\n",image->ticks_per_second); + "ticks-per-second=%lu\n",(unsigned long) image->ticks_per_second); (void) WriteBlobString(image,buffer); } } @@ -1983,7 +1987,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, if (profile != (StringInfo *) NULL) { (void) FormatMagickString(buffer,MaxTextExtent,"profile:%s=%lu\n", - name,(size_t) GetStringInfoLength(profile)); + name,(unsigned long) GetStringInfoLength(profile)); (void) WriteBlobString(image,buffer); } name=GetNextImageProfile(image); diff --git a/coders/mpc.c b/coders/mpc.c index 576a2473c..15d5eff36 100644 --- a/coders/mpc.c +++ b/coders/mpc.c @@ -1079,12 +1079,13 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image) (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent, "class=%s colors=%lu matte=%s\n",MagickOptionToMnemonic( - MagickClassOptions,image->storage_class),image->colors, - MagickOptionToMnemonic(MagickBooleanOptions,(ssize_t) image->matte)); + MagickClassOptions,image->storage_class),(unsigned long) image->colors, + MagickOptionToMnemonic(MagickBooleanOptions,(unsigned long) + image->matte)); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent, - "columns=%lu rows=%lu depth=%lu\n",image->columns,image->rows, - image->depth); + "columns=%lu rows=%lu depth=%lu\n",(unsigned long) image->columns, + (unsigned long) image->rows,(unsigned long) image->depth); (void) WriteBlobString(image,buffer); if (image->type != UndefinedType) { @@ -1108,7 +1109,8 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image) { (void) FormatMagickString(buffer,MaxTextExtent, "compression=%s quality=%lu\n",MagickOptionToMnemonic( - MagickCompressOptions,image->compression),image->quality); + MagickCompressOptions,image->compression),(unsigned long) + image->quality); (void) WriteBlobString(image,buffer); } if (image->units != UndefinedResolution) @@ -1126,20 +1128,21 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image) if ((image->page.width != 0) || (image->page.height != 0)) { (void) FormatMagickString(buffer,MaxTextExtent,"page=%lux%lu%+ld%+ld\n", - image->page.width,image->page.height,image->page.x,image->page.y); + (unsigned long) image->page.width,(unsigned long) image->page.height, + (long) image->page.x,(long) image->page.y); (void) WriteBlobString(image,buffer); } else if ((image->page.x != 0) || (image->page.y != 0)) { (void) FormatMagickString(buffer,MaxTextExtent,"page=%+ld%+ld\n", - image->page.x,image->page.y); + (long) image->page.x,(long) image->page.y); (void) WriteBlobString(image,buffer); } if ((image->page.x != 0) || (image->page.y != 0)) { (void) FormatMagickString(buffer,MaxTextExtent,"tile-offset=%+ld%+ld\n", - image->tile_offset.x,image->tile_offset.y); + (long) image->tile_offset.x,(long) image->tile_offset.y); (void) WriteBlobString(image,buffer); } if ((GetNextImageInList(image) != (Image *) NULL) || @@ -1147,13 +1150,14 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image) { if (image->scene == 0) (void) FormatMagickString(buffer,MaxTextExtent, - "iterations=%lu delay=%lu ticks-per-second=%lu\n", - image->iterations,image->delay,image->ticks_per_second); + "iterations=%lu delay=%lu ticks-per-second=%lu\n",(long) + image->iterations,(long) image->delay,(long) + image->ticks_per_second); else (void) FormatMagickString(buffer,MaxTextExtent, "scene=%lu iterations=%lu delay=%lu ticks-per-second=%lu\n", - image->scene,image->iterations,image->delay, - image->ticks_per_second); + (long) image->scene,(long) image->iterations,(long) image->delay, + (long) image->ticks_per_second); (void) WriteBlobString(image,buffer); } else @@ -1161,25 +1165,25 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image) if (image->scene != 0) { (void) FormatMagickString(buffer,MaxTextExtent,"scene=%lu\n", - image->scene); + (unsigned long) image->scene); (void) WriteBlobString(image,buffer); } if (image->iterations != 0) { (void) FormatMagickString(buffer,MaxTextExtent,"iterations=%lu\n", - image->iterations); + (unsigned long) image->iterations); (void) WriteBlobString(image,buffer); } if (image->delay != 0) { (void) FormatMagickString(buffer,MaxTextExtent,"delay=%lu\n", - image->delay); + (unsigned long) image->delay); (void) WriteBlobString(image,buffer); } if (image->ticks_per_second != UndefinedTicksPerSecond) { (void) FormatMagickString(buffer,MaxTextExtent, - "ticks-per-second=%lu\n",image->ticks_per_second); + "ticks-per-second=%lu\n",(unsigned long) image->ticks_per_second); (void) WriteBlobString(image,buffer); } } @@ -1251,7 +1255,7 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image) if (profile != (StringInfo *) NULL) { (void) FormatMagickString(buffer,MaxTextExtent,"profile:%s=%lu\n", - name,(size_t) GetStringInfoLength(profile)); + name,(unsigned long) GetStringInfoLength(profile)); (void) WriteBlobString(image,buffer); } name=GetNextImageProfile(image); diff --git a/coders/mpeg.c b/coders/mpeg.c index 6c03d37da..dffe606e4 100644 --- a/coders/mpeg.c +++ b/coders/mpeg.c @@ -540,11 +540,12 @@ static MagickBooleanType WriteMPEGImage(const ImageInfo *image_info, *frame; (void) FormatMagickString(p->filename,MaxTextExtent,"%s%lu.%s", - basename,p->scene,WriteMPEGIntermediateFormat); + basename,(unsigned long) p->scene,WriteMPEGIntermediateFormat); (void) FormatMagickString(filename,MaxTextExtent,"%s%lu.%s", - basename,p->scene,WriteMPEGIntermediateFormat); + basename,(unsigned long) p->scene,WriteMPEGIntermediateFormat); (void) FormatMagickString(previous_image,MaxTextExtent, - "%s%lu.%s",basename,p->scene,WriteMPEGIntermediateFormat); + "%s%lu.%s",basename,(unsigned long) p->scene, + WriteMPEGIntermediateFormat); frame=CloneImage(p,0,0,MagickTrue,&p->exception); if (frame == (Image *) NULL) break; @@ -560,7 +561,7 @@ static MagickBooleanType WriteMPEGImage(const ImageInfo *image_info, default: { (void) FormatMagickString(filename,MaxTextExtent,"%s%lu.%s", - basename,p->scene,WriteMPEGIntermediateFormat); + basename,(unsigned long) p->scene,WriteMPEGIntermediateFormat); if (length > 0) status=BlobToFile(filename,blob,length,&image->exception); break; @@ -570,12 +571,12 @@ static MagickBooleanType WriteMPEGImage(const ImageInfo *image_info, { if (status != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "%lu. Wrote %s file for scene %lu:",i,WriteMPEGIntermediateFormat, - p->scene); + "%lu. Wrote %s file for scene %lu:",(unsigned long) i, + WriteMPEGIntermediateFormat,(unsigned long) p->scene); else (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "%lu. Failed to write %s file for scene %lu:",i, - WriteMPEGIntermediateFormat,p->scene); + "%lu. Failed to write %s file for scene %lu:",(unsigned long) i, + WriteMPEGIntermediateFormat,(unsigned long) p->scene); (void) LogMagickEvent(CoderEvent,GetMagickModule(),"%s", filename); } @@ -612,7 +613,7 @@ static MagickBooleanType WriteMPEGImage(const ImageInfo *image_info, for (i=0; i < (ssize_t) MagickMax((1.0*delay+1.0)/3.0,1.0); i++) { (void) FormatMagickString(p->filename,MaxTextExtent,"%s%lu.%s", - basename,count++,WriteMPEGIntermediateFormat); + basename,(unsigned long) count++,WriteMPEGIntermediateFormat); (void) RelinquishUniqueFileResource(p->filename); } (void) CopyMagickString(p->filename,image_info->filename,MaxTextExtent); diff --git a/coders/msl.c b/coders/msl.c index b75ae1779..8694845c8 100644 --- a/coders/msl.c +++ b/coders/msl.c @@ -1062,7 +1062,8 @@ static void MSLStartElement(void *context,const xmlChar *tag, } } (void) FormatMagickString(text,MaxTextExtent,"%lux%lu%+ld%+ld", - geometry.width,geometry.height,geometry.x,geometry.y); + (unsigned long) geometry.width,(unsigned long) geometry.height, + (long) geometry.x,(long) geometry.y); CloneString(&draw_info->geometry,text); draw_info->affine.sx=current.sx*affine.sx+current.ry*affine.rx; draw_info->affine.rx=current.rx*affine.sx+current.sy*affine.rx; @@ -2039,8 +2040,9 @@ static void MSLStartElement(void *context,const xmlChar *tag, } image=msl_info->image[n]; (void) FormatMagickString(composite_geometry,MaxTextExtent, - "%lux%lu%+ld%+ld",composite_image->columns,composite_image->rows, - geometry.x,geometry.y); + "%lux%lu%+ld%+ld",(unsigned long) composite_image->columns, + (unsigned long) composite_image->rows,(long) geometry.x,(long) + geometry.y); flags=ParseGravityGeometry(image,composite_geometry,&geometry, &exception); if (rotate_image == (Image *) NULL) @@ -2650,7 +2652,8 @@ static void MSLStartElement(void *context,const xmlChar *tag, } } (void) FormatMagickString(text,MaxTextExtent,"%lux%lu%+ld%+ld", - geometry.width,geometry.height,geometry.x,geometry.y); + (unsigned long) geometry.width,(unsigned long) geometry.height, + (long) geometry.x,(long) geometry.y); CloneString(&draw_info->geometry,text); draw_info->affine.sx=current.sx*affine.sx+current.ry*affine.rx; draw_info->affine.rx=current.rx*affine.sx+current.sy*affine.rx; @@ -3262,8 +3265,8 @@ static void MSLStartElement(void *context,const xmlChar *tag, { if (LocaleCompare(keyword,"height") == 0) { - (void) FormatMagickString(value,MaxTextExtent,"%ld", - msl_info->image[n]->rows); + (void) FormatMagickString(value,MaxTextExtent,"%lu", + (unsigned long) msl_info->image[n]->rows); (void) SetImageProperty(msl_info->attributes[n],key,value); break; } @@ -3274,8 +3277,8 @@ static void MSLStartElement(void *context,const xmlChar *tag, { if (LocaleCompare(keyword,"width") == 0) { - (void) FormatMagickString(value,MaxTextExtent,"%ld", - msl_info->image[n]->columns); + (void) FormatMagickString(value,MaxTextExtent,"%lu", + (unsigned long) msl_info->image[n]->columns); (void) SetImageProperty(msl_info->attributes[n],key,value); break; } @@ -4792,7 +4795,8 @@ static void MSLStartElement(void *context,const xmlChar *tag, } } (void) FormatMagickString(text,MaxTextExtent,"%lux%lu%+ld%+ld", - geometry.width,geometry.height,geometry.x,geometry.y); + (unsigned long) geometry.width,(unsigned long) geometry.height, + (long) geometry.x,(long) geometry.y); CloneString(&draw_info->geometry,text); draw_info->affine.sx=current.sx*affine.sx+current.ry*affine.rx; draw_info->affine.rx=current.rx*affine.sx+current.sy*affine.rx; @@ -6045,10 +6049,13 @@ static void MSLStartElement(void *context,const xmlChar *tag, flags=ParseAbsoluteGeometry(image_option,&geometry); flags=ParseAbsoluteGeometry(value,&geometry); (void) FormatMagickString(page,MaxTextExtent,"%lux%lu", - geometry.width,geometry.height); + (unsigned long) geometry.width,(unsigned long) + geometry.height); if (((flags & XValue) != 0) || ((flags & YValue) != 0)) - (void) FormatMagickString(page,MaxTextExtent,"%lux%lu%+ld%+ld", - geometry.width,geometry.height,geometry.x,geometry.y); + (void) FormatMagickString(page,MaxTextExtent, + "%lux%lu%+ld%+ld",(unsigned long) geometry.width, + (unsigned long) geometry.height,(long) geometry.x,(long) + geometry.y); (void) SetImageOption(msl_info->image_info[n],keyword,page); msl_info->image_info[n]->page=GetPageGeometry(page); break; diff --git a/coders/mtv.c b/coders/mtv.c index 8764345bc..a9e3cffa0 100644 --- a/coders/mtv.c +++ b/coders/mtv.c @@ -119,7 +119,7 @@ static Image *ReadMTVImage(const ImageInfo *image_info,ExceptionInfo *exception) unsigned char *pixels; - size_t + unsigned long columns, rows; @@ -370,7 +370,7 @@ static MagickBooleanType WriteMTVImage(const ImageInfo *image_info,Image *image) Initialize raster file header. */ (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n", - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); (void) WriteBlobString(image,buffer); for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/coders/pcd.c b/coders/pcd.c index ddcc5bcfd..7adfadef2 100644 --- a/coders/pcd.c +++ b/coders/pcd.c @@ -644,9 +644,9 @@ static Image *ReadPCDImage(const ImageInfo *image_info,ExceptionInfo *exception) progress_monitor=SetImageProgressMonitor(image, (MagickProgressMonitor) NULL,image->client_data); (void) FormatMagickString(image->filename,MaxTextExtent, - "images/img%04ld.pcd",j); + "images/img%04ld.pcd",(long) j); (void) FormatMagickString(image->magick_filename,MaxTextExtent, - "images/img%04ld.pcd",j); + "images/img%04ld.pcd",(long) j); image->scene=(size_t) j; image->columns=width; image->rows=height; diff --git a/coders/pcl.c b/coders/pcl.c index c5888888b..858d99415 100644 --- a/coders/pcl.c +++ b/coders/pcl.c @@ -306,7 +306,7 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) if (image_info->page != (char *) NULL) (void) ParseAbsoluteGeometry(image_info->page,&page); (void) FormatMagickString(geometry,MaxTextExtent,"%lux%lu", - page.width,page.height); + (unsigned long) page.width,(unsigned long) page.height); if (image_info->monochrome != MagickFalse) delegate_info=GetDelegateInfo("pcl:mono",(char *) NULL,exception); else @@ -327,7 +327,7 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) page.height=(size_t) floor(page.height*image->y_resolution/delta.y+ 0.5); (void) FormatMagickString(options,MaxTextExtent,"-g%lux%lu ", - page.width,page.height); + (unsigned long) page.width,(unsigned long) page.height); image=DestroyImage(image); read_info=CloneImageInfo(image_info); *read_info->magick='\0'; @@ -335,11 +335,11 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) { if (read_info->number_scenes != 1) (void) FormatMagickString(options,MaxTextExtent,"-dLastPage=%lu", - read_info->scene+read_info->number_scenes); + (unsigned long) (read_info->scene+read_info->number_scenes)); else (void) FormatMagickString(options,MaxTextExtent, - "-dFirstPage=%lu -dLastPage=%lu",read_info->scene+1,read_info->scene+ - read_info->number_scenes); + "-dFirstPage=%lu -dLastPage=%lu",(unsigned long) read_info->scene+1, + (unsigned long) (read_info->scene+read_info->number_scenes)); read_info->number_scenes=0; if (read_info->scenes != (char *) NULL) *read_info->scenes='\0'; @@ -722,9 +722,9 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image) (void) WriteBlobString(image,"\033E"); /* printer reset */ (void) WriteBlobString(image,"\033*r3F"); /* set presentation mode */ (void) FormatMagickString(buffer,MaxTextExtent,"\033*r%lus%luT", - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); (void) WriteBlobString(image,buffer); - (void) FormatMagickString(buffer,MaxTextExtent,"\033*t%ldR",density); + (void) FormatMagickString(buffer,MaxTextExtent,"\033*t%ldR",(long) density); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"\033&l0E"); /* top margin 0 */ if (IsMonochromeImage(image,&image->exception) != MagickFalse) @@ -778,12 +778,13 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image) (void) FormatMagickString(buffer,MaxTextExtent, "\033*v%da%db%dc%ldI",ScaleQuantumToChar(image->colormap[i].red), ScaleQuantumToChar(image->colormap[i].green), - ScaleQuantumToChar(image->colormap[i].blue),i); + ScaleQuantumToChar(image->colormap[i].blue),(long) i); (void) WriteBlobString(image,buffer); } for ( ; i < (1L << bits_per_pixel); i++) { - (void) FormatMagickString(buffer,MaxTextExtent,"\033*v%luI",i); + (void) FormatMagickString(buffer,MaxTextExtent,"\033*v%luI", + (unsigned long) i); (void) WriteBlobString(image,buffer); } } @@ -912,7 +913,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image) case NoCompression: { (void) FormatMagickString(buffer,MaxTextExtent,"\033*b%luW", - (size_t) length); + (unsigned long) length); (void) WriteBlobString(image,buffer); (void) WriteBlob(image,length,pixels); break; @@ -922,7 +923,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image) packets=PCLPackbitsCompressImage(length,pixels, compress_pixels); (void) FormatMagickString(buffer,MaxTextExtent,"\033*b%luW", - (size_t) packets); + (unsigned long) packets); (void) WriteBlobString(image,buffer); (void) WriteBlob(image,packets,compress_pixels); break; @@ -935,7 +936,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image) packets=PCLDeltaCompressImage(length,previous_pixels,pixels, compress_pixels); (void) FormatMagickString(buffer,MaxTextExtent,"\033*b%luW", - (size_t) packets); + (unsigned long) packets); (void) WriteBlobString(image,buffer); (void) WriteBlob(image,packets,compress_pixels); (void) CopyMagickMemory(previous_pixels,pixels,length* diff --git a/coders/pdf.c b/coders/pdf.c index a759b38ce..b13bf2db7 100644 --- a/coders/pdf.c +++ b/coders/pdf.c @@ -457,7 +457,7 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) Note spot names. */ (void) FormatMagickString(property,MaxTextExtent,"pdf:SpotColor-%lu", - spotcolor++); + (unsigned long) spotcolor++); i=0; for (c=ReadBlobByte(image); c != EOF; c=ReadBlobByte(image)) { @@ -596,8 +596,8 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) 0.5); page.height=(size_t) floor(page.height*image->y_resolution/delta.y+ 0.5); - (void) FormatMagickString(options,MaxTextExtent,"-g%lux%lu ",page.width, - page.height); + (void) FormatMagickString(options,MaxTextExtent,"-g%lux%lu ", + (unsigned long) page.width,(unsigned long) page.height); } if (cmyk != MagickFalse) (void) ConcatenateMagickString(options,"-dUseCIEColor ",MaxTextExtent); @@ -613,8 +613,8 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception) pages[MaxTextExtent]; (void) FormatMagickString(pages,MaxTextExtent,"-dFirstPage=%lu " - "-dLastPage=%lu",read_info->scene+1,read_info->scene+ - read_info->number_scenes); + "-dLastPage=%lu",(unsigned long) read_info->scene+1,(unsigned long) + (read_info->scene+read_info->number_scenes)); (void) ConcatenateMagickString(options,pages,MaxTextExtent); read_info->number_scenes=0; if (read_info->scenes != (char *) NULL) @@ -1055,7 +1055,8 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) version=(size_t) MagickMax(version,4); if (LocaleCompare(image_info->magick,"PDFA") == 0) version=(size_t) MagickMax(version,6); - (void) FormatMagickString(buffer,MaxTextExtent,"%%PDF-1.%lu \n",version); + (void) FormatMagickString(buffer,MaxTextExtent,"%%PDF-1.%lu \n", + (unsigned long) version); (void) WriteBlobString(image,buffer); if (LocaleCompare(image_info->magick,"PDFA") == 0) (void) WriteBlobString(image,"%âãÏÓ\n"); @@ -1064,19 +1065,20 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) */ xref[object++]=TellBlob(image); root_id=object; - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n", + (unsigned long) object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); if (LocaleCompare(image_info->magick,"PDFA") != 0) (void) FormatMagickString(buffer,MaxTextExtent,"/Pages %lu 0 R\n", - object+1); + (unsigned long) object+1); else { (void) FormatMagickString(buffer,MaxTextExtent,"/Metadata %lu 0 R\n", - object+1); + (unsigned long) object+1); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/Pages %lu 0 R\n", - object+2); + (unsigned long) object+2); } (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"/Type /Catalog\n"); @@ -1097,7 +1099,8 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) Write XMP object. */ xref[object++]=TellBlob(image); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n", + (unsigned long) object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); (void) WriteBlobString(image,"/Subtype /XML\n"); @@ -1126,11 +1129,13 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) */ xref[object++]=TellBlob(image); pages_id=object; - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",(unsigned long) + object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); (void) WriteBlobString(image,"/Type /Pages\n"); - (void) FormatMagickString(buffer,MaxTextExtent,"/Kids [ %lu 0 R ",object+1); + (void) FormatMagickString(buffer,MaxTextExtent,"/Kids [ %lu 0 R ", + (unsigned long) object+1); (void) WriteBlobString(image,buffer); count=(ssize_t) (pages_id+ObjectsPerImage+1); if (image_info->adjoin != MagickFalse) @@ -1144,7 +1149,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) kid_image=image; for ( ; GetNextImageInList(kid_image) != (Image *) NULL; count+=ObjectsPerImage) { - (void) FormatMagickString(buffer,MaxTextExtent,"%ld 0 R ",count); + (void) FormatMagickString(buffer,MaxTextExtent,"%ld 0 R ",(long) count); (void) WriteBlobString(image,buffer); kid_image=GetNextImageInList(kid_image); } @@ -1155,7 +1160,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) } (void) WriteBlobString(image,"]\n"); (void) FormatMagickString(buffer,MaxTextExtent,"/Count %lu\n", - (count-pages_id)/ObjectsPerImage); + (unsigned long) ((count-pages_id)/ObjectsPerImage)); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); (void) WriteBlobString(image,"endobj\n"); @@ -1255,13 +1260,14 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) } SetGeometry(image,&geometry); (void) FormatMagickString(page_geometry,MaxTextExtent,"%lux%lu", - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); if (image_info->page != (char *) NULL) (void) CopyMagickString(page_geometry,image_info->page,MaxTextExtent); else if ((image->page.width != 0) && (image->page.height != 0)) (void) FormatMagickString(page_geometry,MaxTextExtent,"%lux%lu%+ld%+ld", - image->page.width,image->page.height,image->page.x,image->page.y); + (unsigned long) image->page.width,(unsigned long) image->page.height, + (long) image->page.x,(long) image->page.y); else if ((image->gravity != UndefinedGravity) && (LocaleCompare(image_info->magick,"PDF") == 0)) @@ -1292,12 +1298,13 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) Write Page object. */ xref[object++]=TellBlob(image); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",(unsigned long) + object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); (void) WriteBlobString(image,"/Type /Page\n"); (void) FormatMagickString(buffer,MaxTextExtent,"/Parent %lu 0 R\n", - pages_id); + (unsigned long) pages_id); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"/Resources <<\n"); labels=(char **) NULL; @@ -1307,14 +1314,16 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) if (labels != (char **) NULL) { (void) FormatMagickString(buffer,MaxTextExtent, - "/Font << /F%lu %lu 0 R >>\n",image->scene,object+4); + "/Font << /F%lu %lu 0 R >>\n",(unsigned long) image->scene, + (unsigned long) object+4); (void) WriteBlobString(image,buffer); } (void) FormatMagickString(buffer,MaxTextExtent, - "/XObject << /Im%lu %lu 0 R >>\n",image->scene,object+5); + "/XObject << /Im%lu %lu 0 R >>\n",(unsigned long) image->scene, + (unsigned long) object+5); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/ProcSet %lu 0 R >>\n", - object+3); + (unsigned long) object+3); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent, "/MediaBox [0 0 %g %g]\n",72.0*media_info.width/resolution.x, @@ -1325,10 +1334,10 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) 72.0*media_info.height/resolution.y); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/Contents %lu 0 R\n", - object+1); + (unsigned long) object+1); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/Thumb %lu 0 R\n", - object+8); + (unsigned long) object+8); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); (void) WriteBlobString(image,"endobj\n"); @@ -1336,11 +1345,12 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) Write Contents object. */ xref[object++]=TellBlob(image); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",(unsigned long) + object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); (void) FormatMagickString(buffer,MaxTextExtent,"/Length %lu 0 R\n", - object+1); + (unsigned long) object+1); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); (void) WriteBlobString(image,"stream\n"); @@ -1351,20 +1361,21 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) { (void) WriteBlobString(image,"BT\n"); (void) FormatMagickString(buffer,MaxTextExtent,"/F%lu %g Tf\n", - image->scene,pointsize); + (unsigned long) image->scene,pointsize); (void) WriteBlobString(image,buffer); - (void) FormatMagickString(buffer,MaxTextExtent,"%ld %ld Td\n", - geometry.x,(ssize_t) (geometry.y+geometry.height+i*pointsize+12)); + (void) FormatMagickString(buffer,MaxTextExtent,"%ld %ld Td\n",(long) + geometry.x,(long) (geometry.y+geometry.height+i*pointsize+12)); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"(%s) Tj\n",labels[i]); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"ET\n"); labels[i]=DestroyString(labels[i]); } - (void) FormatMagickString(buffer,MaxTextExtent, - "%g 0 0 %g %ld %ld cm\n",scale.x,scale.y,geometry.x,geometry.y); + (void) FormatMagickString(buffer,MaxTextExtent,"%g 0 0 %g %ld %ld cm\n", + scale.x,scale.y,(long) geometry.x,(long) geometry.y); (void) WriteBlobString(image,buffer); - (void) FormatMagickString(buffer,MaxTextExtent,"/Im%lu Do\n",image->scene); + (void) FormatMagickString(buffer,MaxTextExtent,"/Im%lu Do\n", + (unsigned long) image->scene); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"Q\n"); offset=TellBlob(image)-offset; @@ -1374,17 +1385,19 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) Write Length object. */ xref[object++]=TellBlob(image); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",(unsigned long) + object); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n", - (size_t) offset); + (unsigned long) offset); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"endobj\n"); /* Write Procset object. */ xref[object++]=TellBlob(image); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n", + (unsigned long) object); (void) WriteBlobString(image,buffer); if ((image->storage_class == DirectClass) || (image->colors > 256)) (void) CopyMagickString(buffer,"[ /PDF /Text /ImageC",MaxTextExtent); @@ -1400,7 +1413,8 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) Write Font object. */ xref[object++]=TellBlob(image); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n", + (unsigned long) object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); if (labels != (char **) NULL) @@ -1408,7 +1422,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) (void) WriteBlobString(image,"/Type /Font\n"); (void) WriteBlobString(image,"/Subtype /Type1\n"); (void) FormatMagickString(buffer,MaxTextExtent,"/Name /F%lu\n", - image->scene); + (unsigned long) image->scene); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"/BaseFont /Helvetica\n"); (void) WriteBlobString(image,"/Encoding /MacRomanEncoding\n"); @@ -1420,13 +1434,14 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) Write XObject object. */ xref[object++]=TellBlob(image); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",(unsigned long) + object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); (void) WriteBlobString(image,"/Type /XObject\n"); (void) WriteBlobString(image,"/Subtype /Image\n"); (void) FormatMagickString(buffer,MaxTextExtent,"/Name /Im%lu\n", - image->scene); + (unsigned long) image->scene); (void) WriteBlobString(image,buffer); switch (compression) { @@ -1473,7 +1488,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/DecodeParms [ << " "/K %s /BlackIs1 false /Columns %ld /Rows %ld >> ]\n",CCITTParam, - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); break; } default: @@ -1485,12 +1500,13 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) } (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/Width %lu\n", - image->columns); + (unsigned long) image->columns); (void) WriteBlobString(image,buffer); - (void) FormatMagickString(buffer,MaxTextExtent,"/Height %lu\n",image->rows); + (void) FormatMagickString(buffer,MaxTextExtent,"/Height %lu\n", + (unsigned long) image->rows); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/ColorSpace %lu 0 R\n", - object+2); + (unsigned long) object+2); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/BitsPerComponent %d\n", (compression == FaxCompression) || (compression == Group4Compression) ? @@ -1499,11 +1515,11 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) if (image->matte != MagickFalse) { (void) FormatMagickString(buffer,MaxTextExtent,"/SMask %lu 0 R\n", - object+7); + (unsigned long) object+7); (void) WriteBlobString(image,buffer); } (void) FormatMagickString(buffer,MaxTextExtent,"/Length %lu 0 R\n", - object+1); + (unsigned long) object+1); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); (void) WriteBlobString(image,"stream\n"); @@ -1831,17 +1847,19 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) Write Length object. */ xref[object++]=TellBlob(image); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",(unsigned long) + object); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n", - (size_t) offset); + (unsigned long) offset); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"endobj\n"); /* Write Colorspace object. */ xref[object++]=TellBlob(image); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",(unsigned long) + object); (void) WriteBlobString(image,buffer); if (image->colorspace == CMYKColorspace) (void) CopyMagickString(buffer,"/DeviceCMYK\n",MaxTextExtent); @@ -1858,8 +1876,8 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) (void) CopyMagickString(buffer,"/DeviceRGB\n",MaxTextExtent); else (void) FormatMagickString(buffer,MaxTextExtent, - "[ /Indexed /DeviceRGB %lu %lu 0 R ]\n", - image->colors-1,object+3); + "[ /Indexed /DeviceRGB %lu %lu 0 R ]\n",(unsigned long) + image->colors-1,(unsigned long) object+3); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"endobj\n"); /* @@ -1873,7 +1891,8 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) if (tile_image == (Image *) NULL) ThrowWriterException(ResourceLimitError,image->exception.reason); xref[object++]=TellBlob(image); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",(unsigned long) + object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); switch (compression) @@ -1921,7 +1940,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/DecodeParms [ << " "/K %s /BlackIs1 false /Columns %lu /Rows %lu >> ]\n",CCITTParam, - tile_image->columns,tile_image->rows); + (unsigned long) tile_image->columns,(unsigned long) tile_image->rows); break; } default: @@ -1933,20 +1952,20 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) } (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/Width %lu\n", - tile_image->columns); + (unsigned long) tile_image->columns); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/Height %lu\n", - tile_image->rows); + (unsigned long) tile_image->rows); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/ColorSpace %lu 0 R\n", - object-1); + (unsigned long) object-1); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/BitsPerComponent %d\n", (compression == FaxCompression) || (compression == Group4Compression) ? 1 : 8); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/Length %lu 0 R\n", - object+1); + (unsigned long) object+1); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); (void) WriteBlobString(image,"stream\n"); @@ -2243,14 +2262,16 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) Write Length object. */ xref[object++]=TellBlob(image); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",(unsigned long) + object); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n", - (size_t) offset); + (unsigned long) offset); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"endobj\n"); xref[object++]=TellBlob(image); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",(unsigned long) + object); (void) WriteBlobString(image,buffer); if ((image->storage_class != DirectClass) && (image->colors <= 256) && (compression != FaxCompression) && (compression != Group4Compression)) @@ -2262,7 +2283,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) if (compression == NoCompression) (void) WriteBlobString(image,"/Filter [ /ASCII85Decode ]\n"); (void) FormatMagickString(buffer,MaxTextExtent,"/Length %lu 0 R\n", - object+1); + (unsigned long) object+1); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); (void) WriteBlobString(image,"stream\n"); @@ -2295,17 +2316,19 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) Write Length object. */ xref[object++]=TellBlob(image); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",(unsigned long) + object); (void) WriteBlobString(image,buffer); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n", - (size_t) offset); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",(unsigned long) + offset); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"endobj\n"); /* Write softmask object. */ xref[object++]=TellBlob(image); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",(unsigned long) + object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); if (image->matte == MagickFalse) @@ -2315,7 +2338,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) (void) WriteBlobString(image,"/Type /XObject\n"); (void) WriteBlobString(image,"/Subtype /Image\n"); (void) FormatMagickString(buffer,MaxTextExtent,"/Name /Ma%lu\n", - image->scene); + (unsigned long) image->scene); (void) WriteBlobString(image,buffer); switch (compression) { @@ -2345,10 +2368,10 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) } (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/Width %lu\n", - image->columns); + (unsigned long) image->columns); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/Height %lu\n", - image->rows); + (unsigned long) image->rows); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"/ColorSpace /DeviceGray\n"); (void) FormatMagickString(buffer,MaxTextExtent,"/BitsPerComponent %d\n", @@ -2356,7 +2379,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) ? 1 : 8); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"/Length %lu 0 R\n", - object+1); + (unsigned long) object+1); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); (void) WriteBlobString(image,"stream\n"); @@ -2443,9 +2466,10 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) Write Length object. */ xref[object++]=TellBlob(image); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",(unsigned long) + object); (void) WriteBlobString(image,buffer); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",(size_t) + (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",(unsigned long) offset); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"endobj\n"); @@ -2462,7 +2486,8 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) */ xref[object++]=TellBlob(image); info_id=object; - (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",object); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu 0 obj\n",(unsigned long) + object); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"<<\n"); (void) FormatMagickString(buffer,MaxTextExtent,"/Title (%s)\n", @@ -2491,27 +2516,31 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image) */ offset=TellBlob(image)-xref[0]+10; (void) WriteBlobString(image,"xref\n"); - (void) FormatMagickString(buffer,MaxTextExtent,"0 %lu\n",object+1); + (void) FormatMagickString(buffer,MaxTextExtent,"0 %lu\n",(unsigned long) + object+1); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"0000000000 65535 f \n"); for (i=0; i < (ssize_t) object; i++) { (void) FormatMagickString(buffer,MaxTextExtent,"%010lu 00000 n \n", - (size_t) xref[i]); + (unsigned long) xref[i]); (void) WriteBlobString(image,buffer); } (void) WriteBlobString(image,"trailer\n"); (void) WriteBlobString(image,"<<\n"); - (void) FormatMagickString(buffer,MaxTextExtent,"/Size %lu\n",object+1); + (void) FormatMagickString(buffer,MaxTextExtent,"/Size %lu\n",(unsigned long) + object+1); (void) WriteBlobString(image,buffer); - (void) FormatMagickString(buffer,MaxTextExtent,"/Info %lu 0 R\n",info_id); + (void) FormatMagickString(buffer,MaxTextExtent,"/Info %lu 0 R\n", + (unsigned long) info_id); (void) WriteBlobString(image,buffer); - (void) FormatMagickString(buffer,MaxTextExtent,"/Root %lu 0 R\n",root_id); + (void) FormatMagickString(buffer,MaxTextExtent,"/Root %lu 0 R\n", + (unsigned long) root_id); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,">>\n"); (void) WriteBlobString(image,"startxref\n"); (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n", - (size_t) offset); + (unsigned long) offset); (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"%%EOF\n"); xref=(MagickOffsetType *) RelinquishMagickMemory(xref); diff --git a/coders/pict.c b/coders/pict.c index a527ae1fc..2b316cc41 100644 --- a/coders/pict.c +++ b/coders/pict.c @@ -1381,8 +1381,8 @@ static Image *ReadPICTImage(const ImageInfo *image_info, if (tile_image == (Image *) NULL) continue; (void) FormatMagickString(geometry,MaxTextExtent,"%lux%lu", - MagickMax(image->columns,tile_image->columns), - MagickMax(image->rows,tile_image->rows)); + (unsigned long) MagickMax(image->columns,tile_image->columns), + (unsigned long) MagickMax(image->rows,tile_image->rows)); (void) SetImageExtent(image, MagickMax(image->columns,tile_image->columns), MagickMax(image->rows,tile_image->rows)); diff --git a/coders/png.c b/coders/png.c index 5fe83d149..0eefea8d6 100644 --- a/coders/png.c +++ b/coders/png.c @@ -549,8 +549,8 @@ static MagickBooleanType CompressColormapTransFirst(Image *image) assert(image->signature == MagickSignature); if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " CompressColorMapTransFirst %s (%ld colors)", - image->filename,image->colors); + " CompressColorMapTransFirst %s (%lu colors)",image->filename, + (unsigned long) image->colors); if (image->storage_class != PseudoClass || image->colors > 256 || image->colors < 2) { @@ -1056,7 +1056,7 @@ static void LogPNGChunk(int logging, png_bytep type, size_t length) if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Writing %c%c%c%c chunk, length: %lu", - type[0],type[1],type[2],type[3],(size_t) length); + type[0],type[1],type[2],type[3],(unsigned long) length); } #endif /* PNG_LIBPNG_VER > 10011 */ @@ -1178,8 +1178,8 @@ static void png_get_data(png_structp png_ptr,png_bytep data,png_size_t length) msg[MaxTextExtent]; (void) FormatMagickString(msg,MaxTextExtent, - "Expected %lu bytes; found %lu bytes",(size_t) length, - (size_t) check); + "Expected %lu bytes; found %lu bytes",(unsigned long) length, + (unsigned long) check); png_warning(png_ptr,msg); png_error(png_ptr,"Read Exception"); } @@ -1895,7 +1895,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, { (void) LogMagickEvent(CoderEvent,GetMagickModule(), " PNG width: %lu, height: %lu", - (size_t) ping_width, (size_t) ping_height); + (unsigned long) ping_width, (unsigned long) ping_height); (void) LogMagickEvent(CoderEvent,GetMagickModule(), " PNG color_type: %d, bit_depth: %d", ping_color_type, ping_bit_depth); @@ -2015,8 +2015,8 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, if (logging != MagickFalse) if (image->page.x || image->page.y) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Reading PNG oFFs chunk: x: %ld, y: %ld.",image->page.x, - image->page.y); + " Reading PNG oFFs chunk: x: %ld, y: %ld.",(long) image->page.x, + (long) image->page.y); } #endif #if defined(PNG_pHYs_SUPPORTED) @@ -2056,7 +2056,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Reading PNG pHYs chunk: xres: %lu, yres: %lu, units: %d.", - (size_t) x_resolution,(size_t) y_resolution,unit_type); + (unsigned long) x_resolution,(unsigned long) y_resolution,unit_type); } #endif if (png_get_valid(ping,ping_info,PNG_INFO_PLTE)) @@ -2312,7 +2312,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, { if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Skipping PNG image data for scene %ld", + " Skipping PNG image data for scene %ld",(long) mng_info->scenes_found-1); png_destroy_read_struct(&ping,&ping_info,&end_info); #if defined(PNG_SETJMP_NOT_THREAD_SAFE) @@ -3240,7 +3240,7 @@ static Image *ReadOneJNGImage(MngInfo *mng_info, if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Reading JNG chunk type %c%c%c%c, length: %lu", - type[0],type[1],type[2],type[3],length); + type[0],type[1],type[2],type[3],(unsigned long) length); if (length > PNG_UINT_31_MAX || count == 0) ThrowReaderException(CorruptImageError,"CorruptImage"); @@ -3285,9 +3285,9 @@ static Image *ReadOneJNGImage(MngInfo *mng_info, if (logging != MagickFalse) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " jng_width: %16lu",(size_t) jng_width); + " jng_width: %16lu",(unsigned long) jng_width); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " jng_width: %16lu",(size_t) jng_height); + " jng_width: %16lu",(unsigned long) jng_height); (void) LogMagickEvent(CoderEvent,GetMagickModule(), " jng_color_type: %16d",jng_color_type); (void) LogMagickEvent(CoderEvent,GetMagickModule(), @@ -4047,7 +4047,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Reading MNG chunk type %c%c%c%c, length: %lu", - type[0],type[1],type[2],type[3],length); + type[0],type[1],type[2],type[3],(unsigned long) length); if (length > PNG_UINT_31_MAX) status=MagickFalse; @@ -4106,9 +4106,9 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) if (logging != MagickFalse) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " MNG width: %lu",mng_info->mng_width); + " MNG width: %lu",(unsigned long) mng_info->mng_width); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " MNG height: %lu",mng_info->mng_height); + " MNG height: %lu",(unsigned long) mng_info->mng_height); } p+=8; mng_info->ticks_per_second=(size_t) mng_get_ssize_t(p); @@ -4149,7 +4149,8 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) (mng_info->mng_height > 65535L)) ThrowReaderException(ImageError,"WidthOrHeightExceedsLimit"); (void) FormatMagickString(page_geometry,MaxTextExtent,"%lux%lu+0+0", - mng_info->mng_width,mng_info->mng_height); + (unsigned long) mng_info->mng_width,(unsigned long) + mng_info->mng_height); mng_info->frame.left=0; mng_info->frame.right=(ssize_t) mng_info->mng_width; mng_info->frame.top=0; @@ -4183,9 +4184,9 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " repeat=%d",repeat); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " final_delay=%ld",final_delay); + " final_delay=%ld",(long) final_delay); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " image->iterations=%ld",image->iterations); + " image->iterations=%ld",(long) image->iterations); } chunk=(unsigned char *) RelinquishMagickMemory(chunk); continue; @@ -4236,9 +4237,11 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) if (logging != MagickFalse) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " x_off[%d]: %lu",object_id,mng_info->x_off[object_id]); + " x_off[%d]: %lu",object_id,(unsigned long) + mng_info->x_off[object_id]); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " y_off[%d]: %lu",object_id,mng_info->y_off[object_id]); + " y_off[%d]: %lu",object_id,(unsigned long) + mng_info->y_off[object_id]); } } /* @@ -4456,7 +4459,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) p+=4; if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Framing_delay=%ld",frame_delay); + " Framing_delay=%ld",(long) frame_delay); } if (change_timeout) { @@ -4467,7 +4470,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) p+=4; if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Framing_timeout=%ld",frame_timeout); + " Framing_timeout=%ld",(long) frame_timeout); } if (change_clipping) { @@ -4477,7 +4480,8 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Frame_clipping: L=%ld R=%ld T=%ld B=%ld", - fb.left, fb.right,fb.top,fb.bottom); + (long) fb.left,(long) fb.right,(long) fb.top, + (long) fb.bottom); if (change_clipping == 2) default_fb=fb; } @@ -4495,8 +4499,8 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) #if defined(MNG_INSERT_LAYERS) if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " subframe_width=%lu, subframe_height=%lu", - subframe_width, subframe_height); + " subframe_width=%lu, subframe_height=%lu",(unsigned long) + subframe_width,(unsigned long) subframe_height); if (insert_layers && (mng_info->framing_mode == 4) && (subframe_width) && (subframe_height)) { @@ -4536,8 +4540,8 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Inserted background layer, L=%ld, R=%ld, T=%ld, B=%ld", - mng_info->clip.left,mng_info->clip.right, - mng_info->clip.top,mng_info->clip.bottom); + (long) mng_info->clip.left,(long) mng_info->clip.right, + (long) mng_info->clip.top,(long) mng_info->clip.bottom); } #endif chunk=(unsigned char *) RelinquishMagickMemory(chunk); @@ -4652,7 +4656,8 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) loop_iters=mng_get_ssize_t(&chunk[1]); if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " LOOP level %ld has %ld iterations ",loop_level,loop_iters); + " LOOP level %ld has %ld iterations ",(long) loop_level, + (long) loop_iters); if (loop_iters == 0) skipping_loop=loop_level; else @@ -4687,7 +4692,8 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " ENDL: LOOP level %ld has %ld remaining iterations ", - loop_level,mng_info->loop_count[loop_level]); + (long) loop_level,(long) + mng_info->loop_count[loop_level]); if (mng_info->loop_count[loop_level] != 0) { offset=SeekBlob(image,mng_info->loop_jump[loop_level], @@ -5016,7 +5022,8 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Inserted transparent background layer, W=%lud, H=%lud", - mng_info->mng_width,mng_info->mng_height); + (unsigned long) mng_info->mng_width,(unsigned long) + mng_info->mng_height); } } /* @@ -5063,8 +5070,8 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Inserted background layer, L=%ld, R=%ld, T=%ld, B=%ld", - mng_info->clip.left,mng_info->clip.right, - mng_info->clip.top,mng_info->clip.bottom); + (long) mng_info->clip.left,(long) mng_info->clip.right, + (long) mng_info->clip.top,(long) mng_info->clip.bottom); } #endif /* MNG_INSERT_LAYERS */ first_mng_object=MagickFalse; @@ -5298,7 +5305,8 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Magnify the rows to %lu",large_image->rows); + " Magnify the rows to %lu",(unsigned long) + large_image->rows); m=(ssize_t) mng_info->magn_mt; yy=0; length=(size_t) image->columns; @@ -5430,7 +5438,8 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) /* magnify the columns */ if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Magnify the columns to %lu",image->columns); + " Magnify the columns to %lu",(unsigned long) + image->columns); for (y=0; y < (ssize_t) image->rows; y++) { @@ -5822,7 +5831,8 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) image->delay=final_delay; if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " image->delay=%lu, final_delay=%lu",image->delay,final_delay); + " image->delay=%lu, final_delay=%lu",(unsigned long) image->delay, + (unsigned long) final_delay); if (logging != MagickFalse) { int @@ -5833,12 +5843,13 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Before coalesce:"); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " scene 0 delay=%lu",image->delay); + " scene 0 delay=%lu",(unsigned long) image->delay); while (GetNextImageInList(image) != (Image *) NULL) { image=GetNextImageInList(image); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " scene %d delay=%lu",++scene,image->delay); + " scene %ld delay=%lu",(long) scene++,(unsigned long) + image->delay); } } @@ -5899,15 +5910,16 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " After coalesce:"); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " scene 0 delay=%lu dispose=%d",image->delay,(int) image->dispose); + " scene 0 delay=%lu dispose=%ld",(unsigned long) image->delay, + (long) image->dispose); while (GetNextImageInList(image) != (Image *) NULL) - { - image=GetNextImageInList(image); - (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " scene %d delay=%lu dispose=%d",++scene, - image->delay,(int) image->dispose); - } - } + { + image=GetNextImageInList(image); + (void) LogMagickEvent(CoderEvent,GetMagickModule(), + " scene %ld delay=%lu dispose=%ld",(long) scene++, + (unsigned long) image->delay,(long) image->dispose); + } + } image=GetFirstImageInList(image); MngInfoFreeStruct(mng_info,&have_mng_structure); have_mng_structure=MagickFalse; @@ -6244,7 +6256,7 @@ png_write_raw_profile(const ImageInfo *image_info,png_struct *ping, dp+=description_length; *dp++='\n'; (void) FormatMagickString(dp,allocated_length- - (png_size_t) (dp-text[0].text),"%8lu ",(size_t) length); + (png_size_t) (dp-text[0].text),"%8lu ",(unsigned long) length); dp+=8; for (i=0; i < (ssize_t) length; i++) { @@ -6498,15 +6510,15 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, if (logging != MagickFalse) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " width=%lu",(size_t) ping_width); + " width=%lu",(unsigned long) ping_width); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " height=%lu",(size_t) ping_height); + " height=%lu",(unsigned long) ping_height); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " image_matte=%u",image->matte); + " image_matte=%lu",(unsigned long) image->matte); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " image_depth=%lu",image->depth); + " image_depth=%lu",(unsigned long) image->depth); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " requested PNG image_depth=%lu",image->depth); + " requested PNG image_depth=%lu",(unsigned long) image->depth); } save_image_depth=image_depth; ping_bit_depth=(png_byte) save_image_depth; @@ -6623,7 +6635,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, (void) SyncImage(image); if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Colors quantized to %ld",number_colors); + " Colors quantized to %ld",(unsigned long) number_colors); } if (matte) png_set_invalid(ping,ping_info,PNG_INFO_tRNS); @@ -6658,7 +6670,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, #else " %5ld (%5d,%5d,%5d)", #endif - i,palette[i].red,palette[i].green,palette[i].blue); + (long) i,palette[i].red,palette[i].green,palette[i].blue); } if (matte) @@ -6828,7 +6840,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, if (logging != MagickFalse) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Number of colors: %lu",image_colors); + " Number of colors: %lu",(unsigned long) image_colors); (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Tentative PNG bit depth: %d",ping_bit_depth); } @@ -6844,7 +6856,8 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, { if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Colors increased to %ld",image_colors); + " Colors increased to %lu",(unsigned long) + image_colors); } } } @@ -6858,7 +6871,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, (void) LogMagickEvent(CoderEvent,GetMagickModule(), " image_info->type: %d",image_info->type); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " image_depth: %lu",image_depth); + " image_depth: %lu",(unsigned long) image_depth); (void) LogMagickEvent(CoderEvent,GetMagickModule(), " ping_bit_depth: %d",ping_bit_depth); } @@ -7564,7 +7577,8 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Writing PNG image data"); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Allocating %lu bytes of memory for pixels",rowbytes); + " Allocating %lu bytes of memory for pixels",(unsigned long) + rowbytes); } png_pixels=(unsigned char *) AcquireQuantumMemory(rowbytes, sizeof(*png_pixels)); @@ -7800,9 +7814,9 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Wrote PNG image data"); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Width: %lu",(size_t) ping_width); + " Width: %lu",(unsigned long) ping_width); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Height: %lu",(size_t) ping_height); + " Height: %lu",(unsigned long) ping_height); if (mng_info->write_png_depth) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), @@ -8308,12 +8322,12 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Creating blob."); blob=ImageToBlob(jpeg_image_info,jpeg_image,&length, - &image->exception); + &image->exception); jng_alpha_sample_depth=8; if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Successfully read jpeg_image into a blob, length=%lu.", - (size_t) length); + (unsigned long) length); } /* Destroy JPEG image and image_info */ @@ -8341,9 +8355,9 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, if (logging != MagickFalse) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " JNG width:%15lu",image->columns); + " JNG width:%15lu",(unsigned long) image->columns); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " JNG height:%14lu",image->rows); + " JNG height:%14lu",(unsigned long) image->rows); (void) LogMagickEvent(CoderEvent,GetMagickModule(), " JNG color type:%10d",jng_color_type); (void) LogMagickEvent(CoderEvent,GetMagickModule(), @@ -8537,8 +8551,8 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, /* Write IDAT chunk header */ if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Write IDAT chunks from blob, length=%lu.", - (size_t) length); + " Write IDAT chunks from blob, length=%lu.",(unsigned long) + length); /* Copy IDAT chunks */ len=0; diff --git a/coders/pnm.c b/coders/pnm.c index 20c7f9e31..9313b720c 100644 --- a/coders/pnm.c +++ b/coders/pnm.c @@ -1571,7 +1571,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image) if (image->colorspace != RGBColorspace) (void) TransformImageColorspace(image,RGBColorspace); (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n", - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); (void) WriteBlobString(image,buffer); } else @@ -1583,7 +1583,8 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image) PAM header. */ (void) FormatMagickString(buffer,MaxTextExtent, - "WIDTH %lu\nHEIGHT %lu\n",image->columns,image->rows); + "WIDTH %lu\nHEIGHT %lu\n",(unsigned long) image->columns, + (unsigned long) image->rows); (void) WriteBlobString(image,buffer); quantum_type=GetQuantumType(image,&image->exception); switch (quantum_type) @@ -1620,7 +1621,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image) if (image->depth > 16) image->depth=16; (void) FormatMagickString(buffer,MaxTextExtent, - "DEPTH %lu\nMAXVAL %lu\n",(size_t) packet_size,(size_t) + "DEPTH %lu\nMAXVAL %lu\n",(unsigned long) packet_size,(unsigned long) GetQuantumRange(image->depth)); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"TUPLTYPE %s\nENDHDR\n", @@ -1852,7 +1853,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image) */ if (image->depth > 8) image->depth=16; - (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",(size_t) + (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",(unsigned long) GetQuantumRange(image->depth)); (void) WriteBlobString(image,buffer); quantum_info=AcquireQuantumInfo((const ImageInfo *) NULL,image); @@ -1935,7 +1936,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image) */ if (image->depth > 8) image->depth=16; - (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",(size_t) + (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",(unsigned long) GetQuantumRange(image->depth)); (void) WriteBlobString(image,buffer); quantum_info=AcquireQuantumInfo((const ImageInfo *) NULL,image); diff --git a/coders/ps.c b/coders/ps.c index 230c6b69b..1b3ce5b4d 100644 --- a/coders/ps.c +++ b/coders/ps.c @@ -401,7 +401,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) StringInfo *profile; - size_t + unsigned long columns, extent, language_level, @@ -731,7 +731,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) page.height=(size_t) floor(page.height*image->y_resolution/delta.y+ 0.5); (void) FormatMagickString(options,MaxTextExtent,"-g%lux%lu ", - page.width,page.height); + (unsigned long) page.width,(unsigned long) page.height); read_info=CloneImageInfo(image_info); *read_info->magick='\0'; if (read_info->number_scenes != 0) @@ -740,8 +740,8 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) pages[MaxTextExtent]; (void) FormatMagickString(pages,MaxTextExtent,"-dFirstPage=%lu " - "-dLastPage=%lu",read_info->scene+1,read_info->scene+ - read_info->number_scenes); + "-dLastPage=%lu",(unsigned long) read_info->scene+1,(unsigned long) + (read_info->scene+read_info->number_scenes)); (void) ConcatenateMagickString(options,pages,MaxTextExtent); read_info->number_scenes=0; if (read_info->scenes != (char *) NULL) @@ -1424,13 +1424,14 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image) } SetGeometry(image,&geometry); (void) FormatMagickString(page_geometry,MaxTextExtent,"%lux%lu", - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); if (image_info->page != (char *) NULL) (void) CopyMagickString(page_geometry,image_info->page,MaxTextExtent); else if ((image->page.width != 0) && (image->page.height != 0)) (void) FormatMagickString(page_geometry,MaxTextExtent,"%lux%lu%+ld%+ld", - image->page.width,image->page.height,image->page.x,image->page.y); + (unsigned long) image->page.width,(unsigned long) image->page.height, + (long) image->page.x,(long) image->page.y); else if ((image->gravity != UndefinedGravity) && (LocaleCompare(image_info->magick,"PS") == 0)) @@ -1488,9 +1489,9 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image) else { (void) FormatMagickString(buffer,MaxTextExtent, - "%%%%BoundingBox: %ld %ld %ld %ld\n",(ssize_t) ceil(bounds.x1-0.5), - (ssize_t) ceil(bounds.y1-0.5),(ssize_t) floor(bounds.x2+0.5), - (ssize_t) floor(bounds.y2+0.5)); + "%%%%BoundingBox: %ld %ld %ld %ld\n",(long) ceil(bounds.x1-0.5), + (long) ceil(bounds.y1-0.5),(long) floor(bounds.x2+0.5),(long) + floor(bounds.y2+0.5)); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent, "%%%%HiResBoundingBox: %g %g %g %g\n",bounds.x1, @@ -1504,7 +1505,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image) Embed Photoshop profile. */ (void) FormatMagickString(buffer,MaxTextExtent, - "%%BeginPhotoshop: %lu",(size_t) GetStringInfoLength( + "%%BeginPhotoshop: %lu",(unsigned long) GetStringInfoLength( profile)); (void) WriteBlobString(image,buffer); for (i=0; i < (ssize_t) GetStringInfoLength(profile); i++) @@ -1525,7 +1526,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image) */ (void) WriteBlobString(image,"\n%begin_xml_code\n"); (void) FormatMagickString(buffer,MaxTextExtent, - "\n%%begin_xml_packet: %lu\n",(size_t) + "\n%%begin_xml_packet: %lu\n",(unsigned long) GetStringInfoLength(profile)); (void) WriteBlobString(image,buffer); for (i=0; i < (ssize_t) GetStringInfoLength(profile); i++) @@ -1581,9 +1582,10 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image) Dump image as bitmap. */ (void) FormatMagickString(buffer,MaxTextExtent, - "%%%%BeginPreview: %lu %lu %lu %lu\n%% ",preview_image->columns, - preview_image->rows,1L,(((preview_image->columns+7) >> 3)* - preview_image->rows+35)/36); + "%%%%BeginPreview: %lu %lu %lu %lu\n%% ",(unsigned long) + preview_image->columns,(unsigned long) preview_image->rows,1UL, + (unsigned long) ((((preview_image->columns+7) >> 3)* + preview_image->rows+35)/36)); (void) WriteBlobString(image,buffer); q=pixels; for (y=0; y < (ssize_t) image->rows; y++) @@ -1665,12 +1667,13 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image) (void) WriteBlobString(image,"} bind def\n"); (void) WriteBlobString(image,"%%EndProlog\n"); } - (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Page: 1 %lu\n",page++); + (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Page: 1 %lu\n", + (unsigned long) page++); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent, - "%%%%PageBoundingBox: %ld %ld %ld %ld\n",geometry.x,geometry.y, - geometry.x+(ssize_t) geometry.width,geometry.y+(ssize_t) (geometry.height+ - text_size)); + "%%%%PageBoundingBox: %ld %ld %ld %ld\n",(long) geometry.x,(long) + geometry.y,geometry.x+(long) geometry.width,geometry.y+(long) + (geometry.height+text_size)); (void) WriteBlobString(image,buffer); if ((double) geometry.x < bounds.x1) bounds.x1=(double) geometry.x; @@ -1689,9 +1692,8 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image) /* Output image data. */ - (void) FormatMagickString(buffer,MaxTextExtent, - "%ld %ld\n%g %g\n%g\n",geometry.x,geometry.y,scale.x,scale.y, - pointsize); + (void) FormatMagickString(buffer,MaxTextExtent,"%ld %ld\n%g %g\n%g\n", + (long) geometry.x,(long) geometry.y,scale.x,scale.y,pointsize); (void) WriteBlobString(image,buffer); labels=(char **) NULL; value=GetImageProperty(image,"label"); @@ -1724,7 +1726,8 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image) Dump image as grayscale. */ (void) FormatMagickString(buffer,MaxTextExtent, - "%lu %lu\n1\n1\n1\n8\n",image->columns,image->rows); + "%lu %lu\n1\n1\n1\n8\n",(unsigned long) image->columns, + (unsigned long) image->rows); (void) WriteBlobString(image,buffer); q=pixels; for (y=0; y < (ssize_t) image->rows; y++) @@ -1772,7 +1775,8 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image) Dump image as bitmap. */ (void) FormatMagickString(buffer,MaxTextExtent, - "%lu %lu\n1\n1\n1\n1\n",image->columns,image->rows); + "%lu %lu\n1\n1\n1\n1\n",(unsigned long) image->columns, + (unsigned long) image->rows); (void) WriteBlobString(image,buffer); q=pixels; for (y=0; y < (ssize_t) image->rows; y++) @@ -1839,7 +1843,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image) Dump DirectClass image. */ (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n0\n%d\n", - image->columns,image->rows, + (unsigned long) image->columns,(unsigned long) image->rows, image_info->compression == RLECompression ? 1 : 0); (void) WriteBlobString(image,buffer); switch (image_info->compression) @@ -1964,14 +1968,15 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image) Dump PseudoClass image. */ (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n%d\n%d\n0\n", - image->columns,image->rows, + (unsigned long) image->columns,(unsigned long) image->rows, image->storage_class == PseudoClass ? 1 : 0, image_info->compression == RLECompression ? 1 : 0); (void) WriteBlobString(image,buffer); /* Dump number of colors and colormap. */ - (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",image->colors); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",(unsigned long) + image->colors); (void) WriteBlobString(image,buffer); for (i=0; i < (ssize_t) image->colors; i++) { @@ -2100,8 +2105,8 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image) if (page > 2) { (void) FormatMagickString(buffer,MaxTextExtent, - "%%%%BoundingBox: %ld %ld %ld %ld\n",(ssize_t) ceil(bounds.x1-0.5), - (ssize_t) ceil(bounds.y1-0.5),(ssize_t) floor(bounds.x2+0.5),(ssize_t) + "%%%%BoundingBox: %ld %ld %ld %ld\n",(long) ceil(bounds.x1-0.5), + (long) ceil(bounds.y1-0.5),(long) floor(bounds.x2+0.5),(long) floor(bounds.y2+0.5)); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent, diff --git a/coders/ps2.c b/coders/ps2.c index f41c2bf53..e75c54859 100644 --- a/coders/ps2.c +++ b/coders/ps2.c @@ -516,13 +516,14 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image) } SetGeometry(image,&geometry); (void) FormatMagickString(page_geometry,MaxTextExtent,"%lux%lu", - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); if (image_info->page != (char *) NULL) (void) CopyMagickString(page_geometry,image_info->page,MaxTextExtent); else if ((image->page.width != 0) && (image->page.height != 0)) (void) FormatMagickString(page_geometry,MaxTextExtent,"%lux%lu%+ld%+ld", - image->page.width,image->page.height,image->page.x,image->page.y); + (unsigned long) image->page.width,(unsigned long) image->page.height, + (long) image->page.x,(long) image->page.y); else if ((image->gravity != UndefinedGravity) && (LocaleCompare(image_info->magick,"PS") == 0)) @@ -580,8 +581,8 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image) else { (void) FormatMagickString(buffer,MaxTextExtent, - "%%%%BoundingBox: %ld %ld %ld %ld\n",(ssize_t) ceil(bounds.x1-0.5), - (ssize_t) ceil(bounds.y1-0.5),(ssize_t) floor(bounds.x2+0.5),(ssize_t) + "%%%%BoundingBox: %ld %ld %ld %ld\n",(long) ceil(bounds.x1-0.5), + (long) ceil(bounds.y1-0.5),(long) floor(bounds.x2+0.5),(long) floor(bounds.y2+0.5)); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent, @@ -604,7 +605,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image) (void) CopyMagickString(buffer,"%%Pages: 1\n",MaxTextExtent); else (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Pages: %lu\n", - (size_t) GetImageListLength(image)); + (unsigned long) GetImageListLength(image)); (void) WriteBlobString(image,buffer); } (void) WriteBlobString(image,"%%EndComments\n"); @@ -671,11 +672,12 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image) (void) WriteBlobString(image,"} bind def\n"); (void) WriteBlobString(image,"%%EndProlog\n"); } - (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Page: 1 %lu\n",page++); + (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Page: 1 %lu\n", + (unsigned long) page++); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent, - "%%%%PageBoundingBox: %ld %ld %ld %ld\n",geometry.x,geometry.y, - geometry.x+(ssize_t) geometry.width,geometry.y+(ssize_t) + "%%%%PageBoundingBox: %ld %ld %ld %ld\n",(long) geometry.x,(long) + geometry.y, geometry.x+(long) geometry.width,geometry.y+(long) (geometry.height+text_size)); (void) WriteBlobString(image,buffer); if ((double) geometry.x < bounds.x1) @@ -701,9 +703,8 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image) /* Output image data. */ - (void) FormatMagickString(buffer,MaxTextExtent, - "%ld %ld\n%g %g\n%g\n",geometry.x,geometry.y,scale.x,scale.y, - pointsize); + (void) FormatMagickString(buffer,MaxTextExtent,"%ld %ld\n%g %g\n%g\n", + (long) geometry.x,(long) geometry.y,scale.x,scale.y,pointsize); (void) WriteBlobString(image,buffer); labels=(char **) NULL; value=GetImageProperty(image,"label"); @@ -728,7 +729,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image) (IsGrayImage(image,&image->exception) != MagickFalse))) { (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n1\n%d\n", - image->columns,image->rows,(int) + (unsigned long) image->columns,(unsigned long) image->rows,(int) (image->colorspace == CMYKColorspace)); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"%d\n", @@ -839,7 +840,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image) (compression == JPEGCompression) || (image->matte != MagickFalse)) { (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n0\n%d\n", - image->columns,image->rows,(int) + (unsigned long) image->columns,(unsigned long) image->rows,(int) (image->colorspace == CMYKColorspace)); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"%d\n", @@ -979,13 +980,14 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image) Dump number of colors and colormap. */ (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n1\n%d\n", - image->columns,image->rows,(int) + (unsigned long) image->columns,(unsigned long) image->rows,(int) (image->colorspace == CMYKColorspace)); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent,"%d\n", (int) (compression == NoCompression)); (void) WriteBlobString(image,buffer); - (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",image->colors); + (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n",(unsigned long) + image->colors); (void) WriteBlobString(image,buffer); for (i=0; i < (ssize_t) image->colors; i++) { @@ -1073,7 +1075,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image) if (offset < 0) ThrowWriterException(CorruptImageError,"ImproperImageHeader"); (void) FormatMagickString(buffer,MaxTextExtent, - "%%%%BeginData:%13ld %s Bytes\n",(ssize_t) length, + "%%%%BeginData:%13ld %s Bytes\n",(long) length, compression == NoCompression ? "ASCII" : "Binary"); (void) WriteBlobString(image,buffer); offset=SeekBlob(image,stop,SEEK_SET); @@ -1093,8 +1095,8 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image) if (page > 1) { (void) FormatMagickString(buffer,MaxTextExtent, - "%%%%BoundingBox: %ld %ld %ld %ld\n",(ssize_t) ceil(bounds.x1-0.5), - (ssize_t) ceil(bounds.y1-0.5),(ssize_t) floor(bounds.x2+0.5),(ssize_t) + "%%%%BoundingBox: %ld %ld %ld %ld\n",(long) ceil(bounds.x1-0.5), + (long) ceil(bounds.y1-0.5),(long) floor(bounds.x2+0.5),(long) floor(bounds.y2+0.5)); (void) WriteBlobString(image,buffer); (void) FormatMagickString(buffer,MaxTextExtent, diff --git a/coders/ps3.c b/coders/ps3.c index 73eadc462..bd720f8d6 100644 --- a/coders/ps3.c +++ b/coders/ps3.c @@ -479,7 +479,7 @@ static MagickBooleanType WritePS3MaskImage(const ImageInfo *image_info, { (void) FormatMagickString(buffer,MaxTextExtent, "currentfile %lu %lu "PS3_NoCompression" ByteStreamDecodeFilter\n", - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); break; } case FaxCompression: @@ -487,28 +487,28 @@ static MagickBooleanType WritePS3MaskImage(const ImageInfo *image_info, { (void) FormatMagickString(buffer,MaxTextExtent, "currentfile %lu %lu "PS3_FaxCompression" ByteStreamDecodeFilter\n", - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); break; } case LZWCompression: { (void) FormatMagickString(buffer,MaxTextExtent, "currentfile %lu %lu "PS3_LZWCompression" ByteStreamDecodeFilter\n", - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); break; } case RLECompression: { (void) FormatMagickString(buffer,MaxTextExtent, "currentfile %lu %lu "PS3_RLECompression" ByteStreamDecodeFilter\n", - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); break; } case ZipCompression: { (void) FormatMagickString(buffer,MaxTextExtent, "currentfile %lu %lu "PS3_ZipCompression" ByteStreamDecodeFilter\n", - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); break; } } @@ -589,7 +589,7 @@ static MagickBooleanType WritePS3MaskImage(const ImageInfo *image_info, if (offset < 0) ThrowWriterException(CorruptImageError,"ImproperImageHeader"); (void) FormatMagickString(buffer,MaxTextExtent, - "%%%%BeginData:%13ld %s Bytes\n",(ssize_t) length, + "%%%%BeginData:%13ld %s Bytes\n",(long) length, compression == NoCompression ? "ASCII" : "BINARY"); (void) WriteBlobString(image,buffer); offset=SeekBlob(image,stop,SEEK_SET); @@ -940,13 +940,14 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image) } SetGeometry(image,&geometry); (void) FormatMagickString(page_geometry,MaxTextExtent,"%lux%lu", - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); if (image_info->page != (char *) NULL) (void) CopyMagickString(page_geometry,image_info->page,MaxTextExtent); else if ((image->page.width != 0) && (image->page.height != 0)) (void) FormatMagickString(page_geometry,MaxTextExtent,"%lux%lu%+ld%+ld", - image->page.width,image->page.height,image->page.x,image->page.y); + (unsigned long) image->page.width,(unsigned long) image->page.height, + (long) image->page.x,(long) image->page.y); else if ((image->gravity != UndefinedGravity) && (LocaleCompare(image_info->magick,"PS") == 0)) @@ -1045,7 +1046,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image) (void) CopyMagickString(buffer,"%%Pages: 1\n",MaxTextExtent); else (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Pages: %lu\n", - (size_t) GetImageListLength(image)); + (unsigned long) GetImageListLength(image)); (void) WriteBlobString(image,buffer); } (void) WriteBlobString(image,"%%EndComments\n"); @@ -1085,14 +1086,16 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image) } (void)WriteBlobString(image,"%%EndProlog\n"); } - (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Page: 1 %lu\n",page); + (void) FormatMagickString(buffer,MaxTextExtent,"%%%%Page: 1 %lu\n", + (unsigned long) page); (void) WriteBlobString(image,buffer); /* Page bounding box. */ (void) FormatMagickString(buffer,MaxTextExtent, - "%%%%PageBoundingBox: %ld %ld %ld %ld\n",geometry.x,geometry.y,geometry.x+ - (ssize_t) geometry.width,geometry.y+(ssize_t) (geometry.height+text_size)); + "%%%%PageBoundingBox: %ld %ld %ld %ld\n",(long) geometry.x,(long) + geometry.y,geometry.x+(long) geometry.width,geometry.y+(long) + (geometry.height+text_size)); (void) WriteBlobString(image,buffer); /* Page process colors if not RGB. @@ -1164,9 +1167,8 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image) /* Translate, scale, and font point size. */ - (void) FormatMagickString(buffer,MaxTextExtent, - "%ld %ld\n%g %g\n%g\n",geometry.x,geometry.y,scale.x,scale.y, - pointsize); + (void) FormatMagickString(buffer,MaxTextExtent,"%ld %ld\n%g %g\n%g\n", + (long) geometry.x,(long) geometry.y,scale.x,scale.y,pointsize); (void) WriteBlobString(image,buffer); /* Output labels. @@ -1214,8 +1216,9 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image) Image columns, rows, and color space. */ (void) FormatMagickString(buffer,MaxTextExtent,"%lu %lu\n%s\n", - image->columns,image->rows,image->colorspace == CMYKColorspace ? - PS3_CMYKColorspace : PS3_RGBColorspace); + (unsigned long) image->columns,(unsigned long) image->rows, + image->colorspace == CMYKColorspace ? PS3_CMYKColorspace : + PS3_RGBColorspace); (void) WriteBlobString(image,buffer); /* Masked image? @@ -1469,7 +1472,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image) Number of colors in color map. */ (void) FormatMagickString(buffer,MaxTextExtent,"%lu\n", - image->colors); + (unsigned long) image->colors); (void) WriteBlobString(image,buffer); /* Color map - uncompressed. @@ -1558,7 +1561,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image) if (offset < 0) ThrowWriterException(CorruptImageError,"ImproperImageHeader"); (void) FormatMagickString(buffer,MaxTextExtent, - "%%%%BeginData:%13ld %s Bytes\n",(ssize_t) length, + "%%%%BeginData:%13ld %s Bytes\n",(long) length, compression == NoCompression ? "ASCII" : "BINARY"); (void) WriteBlobString(image,buffer); offset=SeekBlob(image,stop,SEEK_SET); diff --git a/coders/psd.c b/coders/psd.c index 037c7d8d1..9c91c4ce3 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -774,8 +774,9 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) psd_info.mode=ReadBlobMSBShort(image); if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Image is %ld x %ld with channels=%d, depth=%d, mode=%s", - psd_info.columns,psd_info.rows,psd_info.channels,psd_info.depth, + " Image is %lu x %lu with channels=%lu, depth=%lu, mode=%s", + (unsigned long) psd_info.columns,(unsigned long) psd_info.rows, + (unsigned long) psd_info.channels,(unsigned long) psd_info.depth, ModeToString((PSDImageType) psd_info.mode)); /* Initialize image. @@ -862,7 +863,7 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) */ if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " reading image resource blocks - %ld bytes",(ssize_t) length); + " reading image resource blocks - %lu bytes",(unsigned long) length); blocks=(unsigned char *) AcquireQuantumMemory((size_t) length, sizeof(*blocks)); if (blocks == (unsigned char *) NULL) @@ -935,7 +936,7 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) number_layers=(short) ReadBlobMSBShort(image); if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " image contains %ld layers", number_layers); + " image contains %ld layers",(long) number_layers); if (number_layers < 0) { /* @@ -962,7 +963,7 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) { if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " reading layer #%ld",i+1); + " reading layer #%ld",(long) i+1); layer_info[i].page.y=(ssize_t) ReadBlobMSBLong(image); layer_info[i].page.x=(ssize_t) ReadBlobMSBLong(image); layer_info[i].page.height=(size_t) @@ -978,10 +979,10 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) ThrowReaderException(CorruptImageError,"MaximumChannelsExceeded"); if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " offset(%ld,%ld), size(%ld,%ld), channels=%d", - layer_info[i].page.x, layer_info[i].page.y, - layer_info[i].page.height,layer_info[i].page.width, - layer_info[i].channels); + " offset(%ld,%ld), size(%ld,%ld), channels=%ld", + (long) layer_info[i].page.x,(long) layer_info[i].page.y, + (long) layer_info[i].page.height,(long) + layer_info[i].page.width,(long) layer_info[i].channels); for (j=0; j < (ssize_t) layer_info[i].channels; j++) { layer_info[i].channel_info[j].type=(short) @@ -990,9 +991,9 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) GetPSDSize(&psd_info,image); if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " channel[%ld]: type=%d, size=%ld",j, - layer_info[i].channel_info[j].type, - (ssize_t) layer_info[i].channel_info[j].size); + " channel[%ld]: type=%ld, size=%ld",(long) j, + (long) layer_info[i].channel_info[j].type, + (long) layer_info[i].channel_info[j].size); } count=ReadBlob(image,4,(unsigned char *) type); if ((count == 0) || (LocaleNCompare(type,"8BIM",4) != 0)) @@ -1011,7 +1012,7 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " blend=%.4s, opacity=%lu, clipping=%s, flags=%d, visible=%s", - layer_info[i].blendkey,(size_t) layer_info[i].opacity, + layer_info[i].blendkey,(long) layer_info[i].opacity, layer_info[i].clipping ? "true" : "false",layer_info[i].flags, layer_info[i].visible ? "true" : "false"); (void) ReadBlobByte(image); /* filler */ @@ -1041,9 +1042,9 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " layer mask: offset(%ld,%ld), size(%ld,%ld), length=%ld", - layer_info[i].mask.x,layer_info[i].mask.y, - layer_info[i].mask.width, layer_info[i].mask.height, - (ssize_t) length-16); + (long) layer_info[i].mask.x,(long) layer_info[i].mask.y, + (long) layer_info[i].mask.width,(long) + layer_info[i].mask.height,(long) length-16); /* Skip over the rest of the layer mask information. */ @@ -1059,7 +1060,8 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) */ if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " layer blending ranges: length=%ld",(ssize_t) length); + " layer blending ranges: length=%ld",(long) + length); /* We read it, but don't use it... */ @@ -1127,7 +1129,7 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) */ if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " unsupported data: length=%ld",(ssize_t) + " unsupported data: length=%ld",(long) (size-combinedlength)); for (j=0; j < (ssize_t) (size-combinedlength); j++) (void) ReadBlobByte(image); @@ -1143,7 +1145,7 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) layer_info[j].image=DestroyImage(layer_info[j].image); if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " allocation of image for layer %ld failed", i); + " allocation of image for layer %ld failed",(long) i); ThrowReaderException(ResourceLimitError, "MemoryAllocationFailed"); } @@ -1168,13 +1170,13 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) Set up some hidden attributes for folks that need them. */ (void) FormatMagickString(message,MaxTextExtent,"%ld", - layer_info[i].page.x); + (long) layer_info[i].page.x); (void) SetImageArtifact(layer_info[i].image,"psd:layer.x",message); (void) FormatMagickString(message,MaxTextExtent,"%ld", - layer_info[i].page.y); + (long) layer_info[i].page.y); (void) SetImageArtifact(layer_info[i].image,"psd:layer.y",message); (void) FormatMagickString(message,MaxTextExtent,"%lu", - (size_t) layer_info[i].opacity); + (unsigned long) layer_info[i].opacity); (void) SetImageArtifact(layer_info[i].image,"psd:layer.opacity", message); (void) SetImageProperty(layer_info[i].image,"label",(char *) @@ -1190,12 +1192,12 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) { if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " reading data for layer %ld",i); + " reading data for layer %ld",(long) i); for (j=0; j < (ssize_t) layer_info[i].channels; j++) { if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " reading data for channel %ld", j); + " reading data for channel %ld",(long) j); #if 1 if (layer_info[i].channel_info[j].size <= (2*layer_info[i].image->rows)) { @@ -2266,7 +2268,7 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image) (void) WriteBlobMSBLong(image, 0); (void) WriteBlobMSBLong(image, 0); (void) FormatMagickString((char *) layer_name,MaxTextExtent,"L%06ld", - layer_count++ ); + (long) layer_count++); WritePascalString( image, (char*)layer_name, 4 ); } else { size_t length=strlen(theAttr); diff --git a/coders/pwp.c b/coders/pwp.c index 0ff20e2dc..52812a369 100644 --- a/coders/pwp.c +++ b/coders/pwp.c @@ -219,7 +219,7 @@ static Image *ReadPWPImage(const ImageInfo *image_info,ExceptionInfo *exception) if (next_image == (Image *) NULL) break; (void) FormatMagickString(next_image->filename,MaxTextExtent, - "slide_%02ld.sfw",next_image->scene); + "slide_%02ld.sfw",(long) next_image->scene); if (image == (Image *) NULL) image=next_image; else diff --git a/coders/svg.c b/coders/svg.c index b3afaef69..a7ba49187 100644 --- a/coders/svg.c +++ b/coders/svg.c @@ -2116,8 +2116,8 @@ static void SVGStartElement(void *context,const xmlChar *name, svg_info->view_box=svg_info->bounds; 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); + MVGPrintf(svg_info->file,"viewbox 0 0 %lu %lu\n",(unsigned long) + svg_info->width,(unsigned long) svg_info->height); sx=(double) svg_info->width/svg_info->view_box.width; sy=(double) svg_info->height/svg_info->view_box.height; MVGPrintf(svg_info->file,"affine %g 0 0 %g 0.0 0.0\n",sx,sy); @@ -2411,7 +2411,7 @@ static void SVGCharacters(void *context,const xmlChar *c,int length) Receiving some characters from the parser. */ (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " SAX.characters(%s,%lu)",c,(size_t) length); + " SAX.characters(%s,%lu)",c,(unsigned long) length); svg_info=(SVGInfo *) context; if (svg_info->text != (char *) NULL) svg_info->text=(char *) ResizeQuantumMemory(svg_info->text, @@ -3430,7 +3430,8 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image) (void) WriteBlobString(image, " \"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">\n"); (void) FormatMagickString(message,MaxTextExtent, - "\n",image->columns,image->rows); + "\n",(unsigned long) image->columns, + (unsigned long) image->rows); (void) WriteBlobString(image,message); /* Allocate primitive info memory. diff --git a/coders/ttf.c b/coders/ttf.c index eecdfef17..7f6544fa1 100644 --- a/coders/ttf.c +++ b/coders/ttf.c @@ -250,10 +250,10 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception) draw_info->font=AcquireString(image->filename); ConcatenateString(&draw_info->primitive,"push graphic-context\n"); (void) FormatMagickString(buffer,MaxTextExtent," viewbox 0 0 %lu %lu\n", - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); ConcatenateString(&draw_info->primitive,buffer); ConcatenateString(&draw_info->primitive," font-size 18\n"); - (void) FormatMagickString(buffer,MaxTextExtent," text 10,%ld '",y); + (void) FormatMagickString(buffer,MaxTextExtent," text 10,%ld '",(long) y); ConcatenateString(&draw_info->primitive,buffer); text=EscapeString(Text,'"'); ConcatenateString(&draw_info->primitive,text); @@ -265,12 +265,13 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception) { y+=i+12; ConcatenateString(&draw_info->primitive," font-size 18\n"); - (void) FormatMagickString(buffer,MaxTextExtent," text 10,%ld '%ld'\n",y,i); + (void) FormatMagickString(buffer,MaxTextExtent," text 10,%ld '%ld'\n", + (long) y,(long) i); ConcatenateString(&draw_info->primitive,buffer); - (void) FormatMagickString(buffer,MaxTextExtent," font-size %ld\n",i); + (void) FormatMagickString(buffer,MaxTextExtent," font-size %ld\n",(long) i); ConcatenateString(&draw_info->primitive,buffer); (void) FormatMagickString(buffer,MaxTextExtent," text 50,%ld " - "'That which does not destroy me, only makes me stronger.'\n",y); + "'That which does not destroy me, only makes me stronger.'\n",(long) y); ConcatenateString(&draw_info->primitive,buffer); if (i >= 24) i+=6; diff --git a/coders/txt.c b/coders/txt.c index 4b823fd6f..7983477ee 100644 --- a/coders/txt.c +++ b/coders/txt.c @@ -109,7 +109,7 @@ static MagickBooleanType IsTXT(const unsigned char *magick,const size_t length) ssize_t count; - size_t + unsigned long columns, depth, rows; @@ -248,13 +248,15 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image, (void) SetImageBackgroundColor(image); draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL); (void) CloneString(&draw_info->text,image_info->filename); - (void) FormatMagickString(geometry,MaxTextExtent,"0x0%+ld%+ld",page.x,page.y); + (void) FormatMagickString(geometry,MaxTextExtent,"0x0%+ld%+ld",(long) page.x, + (long) page.y); (void) CloneString(&draw_info->geometry,geometry); status=GetTypeMetrics(image,draw_info,&metrics); if (status == MagickFalse) ThrowReaderException(TypeError,"UnableToGetTypeMetrics"); page.y=(ssize_t) ceil((double) page.y+metrics.ascent-0.5); - (void) FormatMagickString(geometry,MaxTextExtent,"0x0%+ld%+ld",page.x,page.y); + (void) FormatMagickString(geometry,MaxTextExtent,"0x0%+ld%+ld",(long) page.x, + (long) page.y); (void) CloneString(&draw_info->geometry,geometry); (void) CopyMagickString(filename,image_info->filename,MaxTextExtent); if (*draw_info->text != '\0') @@ -368,7 +370,7 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception) IndexPacket *indexes; - ssize_t + long type, x_offset, y, @@ -393,9 +395,11 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception) ssize_t count; - size_t + unsigned long depth, - max_value; + height, + max_value, + width; /* Open image file. @@ -421,10 +425,12 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception) do { *colorspace='\0'; - count=(ssize_t) sscanf(text+32,"%lu,%lu,%lu,%s",&image->columns, - &image->rows,&max_value,colorspace); + count=(ssize_t) sscanf(text+32,"%lu,%lu,%lu,%s",&width,&height,&max_value, + colorspace); if (count != 4) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); + image->columns=width; + image->rows=height; for (depth=1; (GetQuantumRange(depth)+1) < max_value; depth++) ; image->depth=depth; LocaleLower(colorspace); @@ -655,8 +661,9 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image) if (image->matte != MagickFalse) (void) ConcatenateMagickString(colorspace,"a",MaxTextExtent); (void) FormatMagickString(buffer,MaxTextExtent, - "# ImageMagick pixel enumeration: %lu,%lu,%lu,%s\n",image->columns, - image->rows,(size_t) GetQuantumRange(image->depth),colorspace); + "# ImageMagick pixel enumeration: %lu,%lu,%lu,%s\n",(unsigned long) + image->columns,(unsigned long) image->rows,(unsigned long) + GetQuantumRange(image->depth),colorspace); (void) WriteBlobString(image,buffer); GetMagickPixelPacket(image,&pixel); for (y=0; y < (ssize_t) image->rows; y++) @@ -667,7 +674,8 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image) indexes=GetVirtualIndexQueue(image); for (x=0; x < (ssize_t) image->columns; x++) { - (void) FormatMagickString(buffer,MaxTextExtent,"%ld,%ld: ",x,y); + (void) FormatMagickString(buffer,MaxTextExtent,"%ld,%ld: ",(long) x, + (long) y); (void) WriteBlobString(image,buffer); SetMagickPixelPacket(image,p,indexes+x,&pixel); (void) CopyMagickString(tuple,"(",MaxTextExtent); diff --git a/coders/vicar.c b/coders/vicar.c index 02803ad88..ff9916578 100644 --- a/coders/vicar.c +++ b/coders/vicar.c @@ -464,8 +464,8 @@ static MagickBooleanType WriteVICARImage(const ImageInfo *image_info, (void) FormatMagickString(header,MaxTextExtent, "LBLSIZE=%lu FORMAT='BYTE' TYPE='IMAGE' BUFSIZE=20000 DIM=2 EOL=0 " "RECSIZE=%lu ORG='BSQ' NL=%lu NS=%lu NB=1 N1=0 N2=0 N3=0 N4=0 NBB=0 " - "NLB=0 TASK='ImageMagick'",(size_t) MaxTextExtent,image->columns, - image->rows,image->columns); + "NLB=0 TASK='ImageMagick'",(unsigned long) MaxTextExtent,(unsigned long) + image->columns,(unsigned long) image->rows,(unsigned long) image->columns); (void) WriteBlob(image,MaxTextExtent,(unsigned char *) header); /* Write VICAR pixels. diff --git a/coders/vid.c b/coders/vid.c index 037044500..215f08e96 100644 --- a/coders/vid.c +++ b/coders/vid.c @@ -174,8 +174,8 @@ static Image *ReadVIDImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) SetImageProperty(next_image,"label",label); label=DestroyString(label); if (image_info->debug != MagickFalse) - (void) LogMagickEvent(CoderEvent,GetMagickModule(),"geometry: %ldx%ld", - next_image->columns,next_image->rows); + (void) LogMagickEvent(CoderEvent,GetMagickModule(),"geometry: %lux%lu", + (unsigned long) next_image->columns,(unsigned long) next_image->rows); SetGeometry(next_image,&geometry); (void) ParseMetaGeometry(read_info->size,&geometry.x,&geometry.y, &geometry.width,&geometry.height); @@ -188,7 +188,8 @@ static Image *ReadVIDImage(const ImageInfo *image_info,ExceptionInfo *exception) } if (image_info->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "thumbnail geometry: %ldx%ld",next_image->columns,next_image->rows); + "thumbnail geometry: %lux%lu",(unsigned long) next_image->columns, + (unsigned long) next_image->rows); AppendImageToList(&images,next_image); status=SetImageProgress(images,LoadImagesTag,i,number_files); if (status == MagickFalse) diff --git a/coders/xpm.c b/coders/xpm.c index d53dc27b7..4e2790fea 100644 --- a/coders/xpm.c +++ b/coders/xpm.c @@ -257,7 +257,10 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception) ssize_t count; - size_t + unsigned long + colors, + columns, + rows, width; /* @@ -310,10 +313,12 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception) { if (*p != '"') continue; - count=(ssize_t) sscanf(p+1,"%lu %lu %lu %lu",&image->columns,&image->rows, - &image->colors,&width); + count=(ssize_t) sscanf(p+1,"%lu %lu %lu %lu",&columns,&rows,&colors,&width); if (count == 4) break; + image->columns=columns; + image->rows=rows; + image->colors=colors; } if ((count != 4) || (width > 10) || (image->columns == 0) || (image->rows == 0) || (image->colors == 0)) @@ -738,7 +743,8 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info, (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"/* columns rows colors chars-per-pixel */\n"); (void) FormatMagickString(buffer,MaxTextExtent,"\"%lu %lu %lu %ld\",\n", - picon->columns,picon->rows,colors,characters_per_pixel); + (unsigned long) picon->columns,(unsigned long) picon->rows,(unsigned long) + colors,(unsigned long) characters_per_pixel); (void) WriteBlobString(image,buffer); GetMagickPixelPacket(image,&pixel); for (i=0; i < (ssize_t) colors; i++) @@ -969,7 +975,8 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image) (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"/* columns rows colors chars-per-pixel */\n"); (void) FormatMagickString(buffer,MaxTextExtent,"\"%lu %lu %lu %ld\",\n", - image->columns,image->rows,image->colors,characters_per_pixel); + (unsigned long) image->columns,(unsigned long) image->rows, + (unsigned long) image->colors,(unsigned long) characters_per_pixel); (void) WriteBlobString(image,buffer); GetMagickPixelPacket(image,&pixel); for (i=0; i < (ssize_t) image->colors; i++) diff --git a/magick/animate.c b/magick/animate.c index e51253494..a0ff52859 100644 --- a/magick/animate.c +++ b/magick/animate.c @@ -829,7 +829,7 @@ MagickExport void XAnimateBackgroundImage(Display *display, ThrowXWindowFatalException(ResourceLimitError,"MemoryAllocationFailed", images->filename); map_info->colormap=(Colormap) NULL; - pixel.pixels=(size_t *) NULL; + pixel.pixels=(unsigned long *) NULL; /* Initialize visual info. */ @@ -966,10 +966,11 @@ MagickExport void XAnimateBackgroundImage(Display *display, { (void) LogMagickEvent(X11Event,GetMagickModule(), "Image: %s[%lu] %lux%lu ",image_list[0]->filename, - image_list[0]->scene,image_list[0]->columns,image_list[0]->rows); + (unsigned long) image_list[0]->scene,(unsigned long) + image_list[0]->columns,(unsigned long) image_list[0]->rows); if (image_list[0]->colors != 0) (void) LogMagickEvent(X11Event,GetMagickModule(),"%luc ", - image_list[0]->colors); + (unsigned long) image_list[0]->colors); (void) LogMagickEvent(X11Event,GetMagickModule(),"%s", image_list[0]->magick); } @@ -1087,11 +1088,11 @@ MagickExport void XAnimateBackgroundImage(Display *display, if (display_image->debug != MagickFalse) { (void) LogMagickEvent(X11Event,GetMagickModule(), - "Image: [%lu] %s %ux%u ",image_list[scene]->scene, + "Image: [%lu] %s %ux%u ",(unsigned long) image_list[scene]->scene, image_list[scene]->filename,columns,rows); if (image_list[scene]->colors != 0) (void) LogMagickEvent(X11Event,GetMagickModule(),"%luc ", - image_list[scene]->colors); + (unsigned long) image_list[scene]->colors); (void) LogMagickEvent(X11Event,GetMagickModule(),"%s", image_list[scene]->magick); } @@ -1534,11 +1535,12 @@ MagickExport Image *XAnimateImages(Display *display, if (display_image->debug != MagickFalse) { (void) LogMagickEvent(X11Event,GetMagickModule(), - "Image: %s[%lu] %lux%lu ",display_image->filename, - display_image->scene,display_image->columns,display_image->rows); + "Image: %s[%lu] %lux%lu ",display_image->filename,(unsigned long) + display_image->scene,(unsigned long) display_image->columns, + (unsigned long) display_image->rows); if (display_image->colors != 0) (void) LogMagickEvent(X11Event,GetMagickModule(),"%luc ", - display_image->colors); + (unsigned long) display_image->colors); (void) LogMagickEvent(X11Event,GetMagickModule(),"%s", display_image->magick); } @@ -1654,8 +1656,8 @@ MagickExport Image *XAnimateImages(Display *display, */ GetPathComponent(display_image->magick_filename,TailPath,filename); (void) FormatMagickString(windows->image.name,MaxTextExtent, - "%s: %s[%lu of %lu]",MagickPackageName,filename,display_image->scene, - number_scenes); + "%s: %s[%lu of %lu]",MagickPackageName,filename,(unsigned long) + display_image->scene,(unsigned long) number_scenes); (void) CopyMagickString(windows->image.icon_name,filename,MaxTextExtent); } if (resource_info->immutable != MagickFalse) @@ -1933,11 +1935,11 @@ MagickExport Image *XAnimateImages(Display *display, if (image_list[scene]->debug != MagickFalse) { (void) LogMagickEvent(X11Event,GetMagickModule(), - "Image: [%lu] %s %ux%u ",image_list[scene]->scene, + "Image: [%lu] %s %ux%u ",(unsigned long) image_list[scene]->scene, image_list[scene]->filename,columns,rows); if (image_list[scene]->colors != 0) (void) LogMagickEvent(X11Event,GetMagickModule(),"%luc ", - image_list[scene]->colors); + (unsigned long) image_list[scene]->colors); (void) LogMagickEvent(X11Event,GetMagickModule(),"%s", image_list[scene]->magick); } @@ -1961,7 +1963,8 @@ MagickExport Image *XAnimateImages(Display *display, while ((p > image_list[scene]->magick_filename) && (*(p-1) != '/')) p--; (void) FormatMagickString(windows->image.name,MaxTextExtent, - "%s: %s[%lu of %lu]",MagickPackageName,p,scene+1,number_scenes); + "%s: %s[%lu of %lu]",MagickPackageName,p,(unsigned long) scene+1, + (unsigned long) number_scenes); } status=XStringListToTextProperty(&windows->image.name,1,&window_name); if (status != Success) @@ -2079,7 +2082,8 @@ MagickExport Image *XAnimateImages(Display *display, while ((p > image_list[scene]->filename) && (*(p-1) != '/')) p--; (void) FormatMagickString(windows->image.name,MaxTextExtent, - "%s: %s[%lu of %lu]",MagickPackageName,p,scene+1,number_scenes); + "%s: %s[%lu of %lu]",MagickPackageName,p,(unsigned long) + scene+1,(unsigned long) number_scenes); if (resource_info->title != (char *) NULL) { char @@ -2243,9 +2247,9 @@ MagickExport Image *XAnimateImages(Display *display, { if (display_image->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), - "Client Message: 0x%lx 0x%lx %d 0x%lx",event.xclient.window, - event.xclient.message_type,event.xclient.format,(size_t) - event.xclient.data.l[0]); + "Client Message: 0x%lx 0x%lx %d 0x%lx",(unsigned long) + event.xclient.window,(unsigned long) event.xclient.message_type, + event.xclient.format,(unsigned long) event.xclient.data.l[0]); if (event.xclient.message_type == windows->im_protocols) { if (*event.xclient.data.l == (ssize_t) windows->im_update_colormap) @@ -2302,7 +2306,7 @@ MagickExport Image *XAnimateImages(Display *display, unsigned char *data; - size_t + unsigned long after, length; @@ -2493,7 +2497,7 @@ MagickExport Image *XAnimateImages(Display *display, *(command+length)='\0'; if (display_image->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), - "Key press: 0x%lx (%c)",(size_t) key_symbol,*command); + "Key press: 0x%lx (%c)",(unsigned long) key_symbol,*command); command_type=NullCommand; switch (key_symbol) { @@ -2562,7 +2566,7 @@ MagickExport Image *XAnimateImages(Display *display, sizeof(command),&key_symbol,(XComposeStatus *) NULL); if (display_image->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), - "Key release: 0x%lx (%c)",(size_t) key_symbol,*command); + "Key release: 0x%lx (%c)",(unsigned long) key_symbol,*command); break; } case LeaveNotify: @@ -2660,14 +2664,15 @@ MagickExport Image *XAnimateImages(Display *display, unsigned char *data; - size_t + unsigned long after, length; if (display_image->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), - "Property Notify: 0x%lx 0x%lx %d",event.xproperty.window, - event.xproperty.atom,event.xproperty.state); + "Property Notify: 0x%lx 0x%lx %d",(unsigned long) + event.xproperty.window,(unsigned long) event.xproperty.atom, + event.xproperty.state); if (event.xproperty.atom != windows->im_remote_command) break; /* @@ -2927,7 +2932,7 @@ static MagickBooleanType XSaveImage(Display *display, Request JPEG quality from user. */ (void) FormatMagickString(quality,MaxTextExtent,"%lu", - image_info->quality); + (unsigned long) image_info->quality); status=XDialogWidget(display,windows,"Save","Enter JPEG quality:", quality); if (*quality == '\0') diff --git a/magick/annotate.c b/magick/annotate.c index be1bc44f5..a1f1356db 100644 --- a/magick/annotate.c +++ b/magick/annotate.c @@ -395,7 +395,7 @@ MagickExport MagickBooleanType AnnotateImage(Image *image, undercolor_info->affine.tx=offset.x-draw_info->affine.ry*metrics.ascent; undercolor_info->affine.ty=offset.y-draw_info->affine.sy*metrics.ascent; (void) FormatMagickString(primitive,MaxTextExtent, - "rectangle 0,0 %g,%lu",metrics.origin.x,height); + "rectangle 0,0 %g,%lu",metrics.origin.x,(unsigned long) height); (void) CloneString(&undercolor_info->primitive,primitive); (void) DrawImage(image,undercolor_info); (void) DestroyDrawInfo(undercolor_info); @@ -1621,8 +1621,8 @@ static MagickBooleanType RenderPostscript(Image *image, text=DestroyString(text); (void) fprintf(file,"showpage\n"); (void) fclose(file); - (void) FormatMagickString(geometry,MaxTextExtent,"%ldx%ld+0+0!",(ssize_t) - floor(extent.x+0.5),(ssize_t) floor(extent.y+0.5)); + (void) FormatMagickString(geometry,MaxTextExtent,"%ldx%ld+0+0!",(long) + floor(extent.x+0.5),(long) floor(extent.y+0.5)); annotate_info=AcquireImageInfo(); (void) FormatMagickString(annotate_info->filename,MaxTextExtent,"ps:%s", filename); @@ -1665,7 +1665,8 @@ static MagickBooleanType RenderPostscript(Image *image, crop_info.y=(ssize_t) ceil((resolution.y/DefaultResolution)*extent.y/8.0- 0.5); (void) FormatMagickString(geometry,MaxTextExtent,"%lux%lu%+ld%+ld", - crop_info.width,crop_info.height,crop_info.x,crop_info.y); + (unsigned long) crop_info.width,(unsigned long) crop_info.height, + (long) crop_info.x,(long) crop_info.y); (void) TransformImage(&annotate_image,geometry,(char *) NULL); } metrics->pixels_per_em.x=(resolution.y/DefaultResolution)* @@ -1865,7 +1866,7 @@ static MagickBooleanType RenderX11(Image *image,const DrawInfo *draw_info, return(MagickFalse); } map_info->colormap=(Colormap) NULL; - pixel.pixels=(size_t *) NULL; + pixel.pixels=(unsigned long *) NULL; /* Initialize Standard Colormap info. */ @@ -1956,8 +1957,8 @@ static MagickBooleanType RenderX11(Image *image,const DrawInfo *draw_info, atan2(draw_info->affine.rx,draw_info->affine.sx); } (void) FormatMagickString(annotate_info.geometry,MaxTextExtent, - "%lux%lu+%ld+%ld",width,height,(ssize_t) ceil(offset->x-0.5), - (ssize_t) ceil(offset->y-metrics->ascent-metrics->descent+ + "%lux%lu+%ld+%ld",(unsigned long) width,(unsigned long) height,(long) + ceil(offset->x-0.5),(long) ceil(offset->y-metrics->ascent-metrics->descent+ draw_info->interline_spacing-0.5)); pixel.pen_color.red=ScaleQuantumToShort(draw_info->fill.red); pixel.pen_color.green=ScaleQuantumToShort(draw_info->fill.green); diff --git a/magick/cache.c b/magick/cache.c index 4f1798dcc..d1eb7b0f3 100644 --- a/magick/cache.c +++ b/magick/cache.c @@ -4241,8 +4241,8 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode, (void) FormatMagickSize(cache_info->length,MagickFalse,format); (void) FormatMagickString(message,MaxTextExtent, "open %s (%s[%d], disk, %lux%lu %sB)",cache_info->filename, - cache_info->cache_filename,cache_info->file,cache_info->columns, - cache_info->rows,format); + cache_info->cache_filename,cache_info->file,(unsigned long) + cache_info->columns,(unsigned long) cache_info->rows,format); (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",message); } return(MagickTrue); @@ -5450,8 +5450,9 @@ static MagickBooleanType WritePixelCacheIndexes(CacheInfo *cache_info, if ((cache_info->debug != MagickFalse) && (QuantumTick(nexus_info->region.y,cache_info->rows) != MagickFalse)) (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s[%lux%lu%+ld%+ld]", - cache_info->filename,nexus_info->region.width,nexus_info->region.height, - nexus_info->region.x,nexus_info->region.y); + cache_info->filename,(unsigned long) nexus_info->region.width, + (unsigned long) nexus_info->region.height,(long) nexus_info->region.x, + (long) nexus_info->region.y); return(MagickTrue); } diff --git a/magick/deprecate.c b/magick/deprecate.c index 7c0ab2912..997da68cf 100644 --- a/magick/deprecate.c +++ b/magick/deprecate.c @@ -1489,7 +1489,7 @@ MagickExport MagickBooleanType DeleteMagickRegistry(const ssize_t id) char key[MaxTextExtent]; - (void) FormatMagickString(key,MaxTextExtent,"%ld\n",id); + (void) FormatMagickString(key,MaxTextExtent,"%ld\n",(long) id); return(DeleteImageRegistry(key)); } @@ -2638,7 +2638,7 @@ MagickExport void *GetMagickRegistry(const ssize_t id,RegistryType *type, *type=UndefinedRegistryType; *length=0; - (void) FormatMagickString(key,MaxTextExtent,"%ld\n",id); + (void) FormatMagickString(key,MaxTextExtent,"%ld\n",(long) id); blob=(void *) GetImageRegistry(ImageRegistryType,key,exception); if (blob != (void *) NULL) return(blob); @@ -5987,7 +5987,7 @@ MagickExport ssize_t SetMagickRegistry(const RegistryType type,const void *blob, static ssize_t id = 0; - (void) FormatMagickString(key,MaxTextExtent,"%ld\n",id); + (void) FormatMagickString(key,MaxTextExtent,"%ld\n",(long) id); status=SetImageRegistry(type,key,blob,exception); if (status == MagickFalse) return(-1); diff --git a/magick/display.c b/magick/display.c index 80db09c55..94b49f79d 100644 --- a/magick/display.c +++ b/magick/display.c @@ -2562,7 +2562,7 @@ static MagickBooleanType XAnnotateEditImage(Display *display, unsigned char *data; - size_t + unsigned long after, length; @@ -3081,7 +3081,8 @@ static MagickBooleanType XChopImage(Display *display, if (windows->info.mapped == MagickFalse) (void) XMapWindow(display,windows->info.id); (void) FormatMagickString(text,MaxTextExtent," %lux%lu%+ld%+ld", - chop_info.width,chop_info.height,chop_info.x,chop_info.y); + (unsigned long) chop_info.width,(unsigned long) chop_info.height, + (long) chop_info.x,(long) chop_info.y); XInfoWidget(display,windows,text); XHighlightLine(display,windows->image.id, windows->image.highlight_context,&segment_info); @@ -3968,7 +3969,7 @@ static MagickBooleanType XCompositeImage(Display *display, Display pointer position. */ (void) FormatMagickString(text,MaxTextExtent," %+ld%+ld ", - composite_info.x,composite_info.y); + (long) composite_info.x,(long) composite_info.y); XInfoWidget(display,windows,text); } highlight_info=composite_info; @@ -4138,7 +4139,7 @@ static MagickBooleanType XCompositeImage(Display *display, *(command+length)='\0'; if (image->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), - "Key press: 0x%lx (%s)",(size_t) key_symbol,command); + "Key press: 0x%lx (%s)",(unsigned long) key_symbol,command); switch ((int) key_symbol) { case XK_Escape: @@ -4370,7 +4371,8 @@ static MagickBooleanType XConfigureImage(Display *display, if (image->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Configure Image: %dx%d=>%lux%lu",windows->image.ximage->width, - windows->image.ximage->height,width,height); + windows->image.ximage->height,(unsigned long) width, + (unsigned long) height); if ((width*height) == 0) return(MagickTrue); x=0; @@ -4630,7 +4632,7 @@ static MagickBooleanType XCropImage(Display *display, Display pointer position. */ (void) FormatMagickString(text,MaxTextExtent," %+ld%+ld ", - crop_info.x,crop_info.y); + (long) crop_info.x,(long) crop_info.y); XInfoWidget(display,windows,text); } /* @@ -4825,7 +4827,8 @@ static MagickBooleanType XCropImage(Display *display, if (windows->info.mapped == MagickFalse) (void) XMapWindow(display,windows->info.id); (void) FormatMagickString(text,MaxTextExtent," %lux%lu%+ld%+ld", - crop_info.width,crop_info.height,crop_info.x,crop_info.y); + (unsigned long) crop_info.width,(unsigned long) crop_info.height, + (long) crop_info.x,(long) crop_info.y); XInfoWidget(display,windows,text); XHighlightRectangle(display,windows->image.id, windows->image.highlight_context,&highlight_info); @@ -4917,7 +4920,8 @@ static MagickBooleanType XCropImage(Display *display, Display pointer position. */ (void) FormatMagickString(text,MaxTextExtent," %lux%lu%+ld%+ld", - crop_info.width,crop_info.height,crop_info.x,crop_info.y); + (unsigned long) crop_info.width,(unsigned long) crop_info.height, + (long) crop_info.x,(long) crop_info.y); XInfoWidget(display,windows,text); } highlight_info=crop_info; @@ -5200,7 +5204,8 @@ static MagickBooleanType XCropImage(Display *display, Set primary selection. */ (void) FormatMagickString(text,MaxTextExtent,"%lux%lu%+ld%+ld", - crop_info.width,crop_info.height,crop_info.x,crop_info.y); + (unsigned long) crop_info.width,(unsigned long) crop_info.height, + (long) crop_info.x,(long) crop_info.y); request=(&(event.xselectionrequest)); (void) XChangeProperty(request->display,request->requestor, request->property,request->target,8,PropModeReplace, @@ -5904,8 +5909,9 @@ static MagickBooleanType XDrawEditImage(Display *display, Display info and draw drawing rectangle. */ (void) FormatMagickString(text,MaxTextExtent," %lux%lu%+ld%+ld", - rectangle_info.width,rectangle_info.height,rectangle_info.x, - rectangle_info.y); + (unsigned long) rectangle_info.width,(unsigned long) + rectangle_info.height,(long) rectangle_info.x, + (long) rectangle_info.y); XInfoWidget(display,windows,text); XHighlightRectangle(display,windows->image.id, windows->image.highlight_context,&rectangle_info); @@ -5927,7 +5933,8 @@ static MagickBooleanType XDrawEditImage(Display *display, Display info and draw drawing rectangle. */ (void) FormatMagickString(text,MaxTextExtent," %lux%lu%+ld%+ld", - rectangle_info.width,rectangle_info.height,rectangle_info.x, + (unsigned long) rectangle_info.width,(unsigned long) + rectangle_info.height,(long) rectangle_info.x,(long) rectangle_info.y); XInfoWidget(display,windows,text); XHighlightEllipse(display,windows->image.id, @@ -7300,7 +7307,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, x=0; y=0; (void) FormatMagickString(geometry,MaxTextExtent,"%lux%lu+0+0", - width,height); + (unsigned long) width,(unsigned long) height); status=XDialogWidget(display,windows,"Resize", "Enter resize geometry (e.g. 640x480, 200%):",geometry); if (*geometry == '\0') @@ -10522,7 +10529,7 @@ static MagickBooleanType XPasteImage(Display *display, Display pointer position. */ (void) FormatMagickString(text,MaxTextExtent," %+ld%+ld ", - paste_info.x,paste_info.y); + (long) paste_info.x,(long) paste_info.y); XInfoWidget(display,windows,text); } highlight_info=paste_info; @@ -10661,7 +10668,7 @@ static MagickBooleanType XPasteImage(Display *display, *(command+length)='\0'; if (image->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), - "Key press: 0x%lx (%s)",(ssize_t) key_symbol,command); + "Key press: 0x%lx (%s)",(long) key_symbol,command); switch ((int) key_symbol) { case XK_Escape: @@ -11158,7 +11165,7 @@ static MagickBooleanType XROIImage(Display *display, Display pointer position. */ (void) FormatMagickString(text,MaxTextExtent," %+ld%+ld ", - roi_info.x,roi_info.y); + (long) roi_info.x,(long) roi_info.y); XInfoWidget(display,windows,text); } /* @@ -11316,7 +11323,8 @@ static MagickBooleanType XROIImage(Display *display, if (windows->info.mapped == MagickFalse) (void) XMapWindow(display,windows->info.id); (void) FormatMagickString(text,MaxTextExtent," %lux%lu%+ld%+ld", - roi_info.width,roi_info.height,roi_info.x,roi_info.y); + (unsigned long) roi_info.width,(unsigned long) roi_info.height, + (long) roi_info.x,(long) roi_info.y); XInfoWidget(display,windows,text); XHighlightRectangle(display,windows->image.id, windows->image.highlight_context,&highlight_info); @@ -11411,7 +11419,8 @@ static MagickBooleanType XROIImage(Display *display, Display pointer position. */ (void) FormatMagickString(text,MaxTextExtent," %lux%lu%+ld%+ld", - roi_info.width,roi_info.height,roi_info.x,roi_info.y); + (unsigned long) roi_info.width,(unsigned long) roi_info.height, + (long) roi_info.x,(long) roi_info.y); XInfoWidget(display,windows,text); } highlight_info=roi_info; @@ -11750,7 +11759,8 @@ static MagickBooleanType XROIImage(Display *display, Set primary selection. */ (void) FormatMagickString(text,MaxTextExtent,"%lux%lu%+ld%+ld", - roi_info.width,roi_info.height,roi_info.x,roi_info.y); + (unsigned long) roi_info.width,(unsigned long) roi_info.height, + (long) roi_info.x,(long) roi_info.y); request=(&(event.xselectionrequest)); (void) XChangeProperty(request->display,request->requestor, request->property,request->target,8,PropModeReplace, @@ -12393,7 +12403,8 @@ static MagickBooleanType XSaveImage(Display *display, /* Request JPEG quality from user. */ - (void) FormatMagickString(quality,MaxTextExtent,"%lu",image->quality); + (void) FormatMagickString(quality,MaxTextExtent,"%lu",(unsigned long) + image->quality); status=XDialogWidget(display,windows,"Save","Enter JPEG quality:", quality); if (*quality == '\0') @@ -12770,7 +12781,9 @@ static void XSetCropGeometry(Display *display,XWindows *windows, Display info on cropping rectangle. */ (void) FormatMagickString(text,MaxTextExtent," %lux%lu%+ld%+ld", - crop_info->width,crop_info->height,crop_info->x,crop_info->y); + (unsigned long) crop_info->width,(unsigned long) crop_info->height, + (long) crop_info->x, + (long) crop_info->y); XInfoWidget(display,windows,text); } /* @@ -13646,7 +13659,7 @@ MagickExport MagickBooleanType XDisplayBackgroundImage(Display *display, ThrowXWindowFatalException(XServerFatalError,"MemoryAllocationFailed", image->filename); map_info->colormap=(Colormap) NULL; - pixel.pixels=(size_t *) NULL; + pixel.pixels=(unsigned long *) NULL; /* Initialize visual info. */ @@ -13722,10 +13735,11 @@ MagickExport MagickBooleanType XDisplayBackgroundImage(Display *display, if (image->debug != MagickFalse) { (void) LogMagickEvent(X11Event,GetMagickModule(), - "Image: %s[%lu] %lux%lu ",image->filename,image->scene, - image->columns,image->rows); + "Image: %s[%lu] %lux%lu ",image->filename,(unsigned long) image->scene, + (unsigned long) image->columns,(unsigned long) image->rows); if (image->colors != 0) - (void) LogMagickEvent(X11Event,GetMagickModule(),"%luc ",image->colors); + (void) LogMagickEvent(X11Event,GetMagickModule(),"%luc ", + (unsigned long) image->colors); (void) LogMagickEvent(X11Event,GetMagickModule(),"%s",image->magick); } /* @@ -14370,10 +14384,11 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, { (void) LogMagickEvent(X11Event,GetMagickModule(), "Image: %s[%lu] %lux%lu ",display_image->filename, - display_image->scene,display_image->columns,display_image->rows); + (unsigned long) display_image->scene,(unsigned long) + display_image->columns,(unsigned long) display_image->rows); if (display_image->colors != 0) (void) LogMagickEvent(X11Event,GetMagickModule(),"%luc ", - display_image->colors); + (unsigned long) display_image->colors); (void) LogMagickEvent(X11Event,GetMagickModule(),"%s", display_image->magick); } @@ -14494,7 +14509,8 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, "%s: %s",MagickPackageName,filename); else (void) FormatMagickString(windows->image.name,MaxTextExtent, - "%s: %s[%lu of %lu]",MagickPackageName,filename,display_image->scene, + "%s: %s[%lu of %lu]",MagickPackageName,filename,(unsigned long) + display_image->scene,(unsigned long) GetImageListLength(display_image)); (void) CopyMagickString(windows->image.icon_name,filename,MaxTextExtent); } @@ -15144,7 +15160,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, if (display_image->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Client Message: 0x%lx 0x%lx %d 0x%lx",event.xclient.window, - event.xclient.message_type,event.xclient.format,(size_t) + event.xclient.message_type,event.xclient.format,(unsigned long) event.xclient.data.l[0]); if (event.xclient.message_type == windows->im_protocols) { @@ -15232,7 +15248,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, unsigned char *data; - size_t + unsigned long after, length; @@ -15553,7 +15569,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, *(command+length)='\0'; if (display_image->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), - "Key press: %d 0x%lx (%s)",event.xkey.state,(size_t) + "Key press: %d 0x%lx (%s)",event.xkey.state,(unsigned long) key_symbol,command); if (event.xkey.window == windows->image.id) { @@ -15591,7 +15607,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, sizeof(command),&key_symbol,(XComposeStatus *) NULL); if (display_image->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), - "Key release: 0x%lx (%c)",(size_t) key_symbol,*command); + "Key release: 0x%lx (%c)",(unsigned long) key_symbol,*command); break; } case LeaveNotify: @@ -15708,7 +15724,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, unsigned char *data; - size_t + unsigned long after, length; diff --git a/magick/distort.c b/magick/distort.c index 532a9bd8b..7ee5f793c 100644 --- a/magick/distort.c +++ b/magick/distort.c @@ -386,7 +386,7 @@ static double *GenerateCoefficients(const Image *image, if ( number_arguments < 1+i*cp_size ) { (void) ThrowMagickException(exception,GetMagickModule(),OptionError, "InvalidArgument", "%s : 'require at least %ld CPs'", - "Polynomial", i); + "Polynomial", (long) i); return((double *) NULL); } break; @@ -1651,8 +1651,8 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method, /* Set destination image size and virtual offset */ if ( bestfit || viewport_given ) { (void) FormatMagickString(image_gen, MaxTextExtent," -size %lux%lu " - "-page %+ld%+ld xc: +insert \\\n",geometry.width,geometry.height, - geometry.x,geometry.y); + "-page %+ld%+ld xc: +insert \\\n",(unsigned long) geometry.width, + (unsigned long) geometry.height,(long) geometry.x,(long) geometry.y); lookup="v.p{ xx-v.page.x-.5, yy-v.page.x-.5 }"; } else { @@ -1789,7 +1789,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method, { size_t nterms = (size_t) coeff[1]; fprintf(stderr, "Polynomial (order %lg, terms %lu), FX Equivelent\n", - coeff[0], nterms); + coeff[0],(unsigned long) nterms); fprintf(stderr, "%s", image_gen); fprintf(stderr, " -fx 'ii=i+page.x+0.5; jj=j+page.y+0.5;\n"); fprintf(stderr, " xx ="); diff --git a/magick/draw.c b/magick/draw.c index 7b897301f..3e69e7ded 100644 --- a/magick/draw.c +++ b/magick/draw.c @@ -416,7 +416,8 @@ static void LogPolygonInfo(const PolygonInfo *polygon_info) p=polygon_info->edges; for (i=0; i < (ssize_t) polygon_info->number_edges; i++) { - (void) LogMagickEvent(DrawEvent,GetMagickModule()," edge %lu:",i); + (void) LogMagickEvent(DrawEvent,GetMagickModule()," edge %lu:", + (unsigned long) i); (void) LogMagickEvent(DrawEvent,GetMagickModule()," direction: %s", p->direction != MagickFalse ? "down" : "up"); (void) LogMagickEvent(DrawEvent,GetMagickModule()," ghostline: %s", @@ -2421,8 +2422,9 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info) (void) SetImageArtifact(image,key,token); (void) FormatMagickString(key,MaxTextExtent,"%s-geometry",name); (void) FormatMagickString(geometry,MaxTextExtent, - "%lux%lu%+ld%+ld",bounds.width,bounds.height,bounds.x, - bounds.y); + "%lux%lu%+ld%+ld",(unsigned long) bounds.width, + (unsigned long) bounds.height,(long) bounds.x, + (long) bounds.y); (void) SetImageArtifact(image,key,geometry); GetMagickToken(q,&q,token); break; @@ -4058,31 +4060,34 @@ static void LogPrimitiveInfo(const PrimitiveInfo *primitive_info) case PointPrimitive: { (void) LogMagickEvent(DrawEvent,GetMagickModule(), - "PointPrimitive %ld,%ld %s",x,y,methods[primitive_info->method]); + "PointPrimitive %ld,%ld %s",(long) x,(long) y, + methods[primitive_info->method]); return; } case ColorPrimitive: { (void) LogMagickEvent(DrawEvent,GetMagickModule(), - "ColorPrimitive %ld,%ld %s",x,y,methods[primitive_info->method]); + "ColorPrimitive %ld,%ld %s",(long) x,(long) y, + methods[primitive_info->method]); return; } case MattePrimitive: { (void) LogMagickEvent(DrawEvent,GetMagickModule(), - "MattePrimitive %ld,%ld %s",x,y,methods[primitive_info->method]); + "MattePrimitive %ld,%ld %s",(long) x,(long) y, + methods[primitive_info->method]); return; } case TextPrimitive: { (void) LogMagickEvent(DrawEvent,GetMagickModule(), - "TextPrimitive %ld,%ld",x,y); + "TextPrimitive %ld,%ld",(long) x,(long) y); return; } case ImagePrimitive: { (void) LogMagickEvent(DrawEvent,GetMagickModule(), - "ImagePrimitive %ld,%ld",x,y); + "ImagePrimitive %ld,%ld",(long) x,(long) y); return; } default: @@ -4099,17 +4104,17 @@ static void LogPrimitiveInfo(const PrimitiveInfo *primitive_info) { coordinates=(ssize_t) primitive_info[i].coordinates; (void) LogMagickEvent(DrawEvent,GetMagickModule(), - " begin open (%ld)",coordinates); + " begin open (%ld)",(long) coordinates); p=point; } point=primitive_info[i].point; if ((fabs(q.x-point.x) > MagickEpsilon) || (fabs(q.y-point.y) > MagickEpsilon)) (void) LogMagickEvent(DrawEvent,GetMagickModule(), - " %ld: %.18g,%.18g",coordinates,point.x,point.y); + " %ld: %.18g,%.18g",(long) coordinates,point.x,point.y); else (void) LogMagickEvent(DrawEvent,GetMagickModule(), - " %ld: %g,%g (duplicate)",coordinates,point.x,point.y); + " %ld: %g,%g (duplicate)",(long) coordinates,point.x,point.y); q=point; coordinates--; if (coordinates > 0) @@ -4117,10 +4122,10 @@ static void LogPrimitiveInfo(const PrimitiveInfo *primitive_info) if ((fabs(p.x-point.x) > MagickEpsilon) || (fabs(p.y-point.y) > MagickEpsilon)) (void) LogMagickEvent(DrawEvent,GetMagickModule()," end last (%ld)", - coordinates); + (long) coordinates); else (void) LogMagickEvent(DrawEvent,GetMagickModule()," end open (%ld)", - coordinates); + (long) coordinates); } } @@ -4477,8 +4482,9 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, geometry.x=x; geometry.y=y; (void) FormatMagickString(composite_geometry,MaxTextExtent, - "%lux%lu%+ld%+ld",composite_image->columns,composite_image->rows, - geometry.x,geometry.y); + "%lux%lu%+ld%+ld",(unsigned long) composite_image->columns, + (unsigned long) composite_image->rows,(long) geometry.x,(long) + geometry.y); (void) ParseGravityGeometry(image,composite_geometry,&geometry, &image->exception); affine=draw_info->affine; diff --git a/magick/effect.c b/magick/effect.c index 451d2044b..a2294c15b 100644 --- a/magick/effect.c +++ b/magick/effect.c @@ -878,13 +878,13 @@ MagickExport Image *BlurImageChannel(const Image *image, *k; (void) LogMagickEvent(TransformEvent,GetMagickModule(), - " BlurImage with %ld kernel:",width); + " BlurImage with %lu kernel:",(unsigned long) width); message=AcquireString(""); k=kernel; for (i=0; i < (ssize_t) width; i++) { *message='\0'; - (void) FormatMagickString(format,MaxTextExtent,"%ld: ",i); + (void) FormatMagickString(format,MaxTextExtent,"%ld: ",(long) i); (void) ConcatenateString(&message,format); (void) FormatMagickString(format,MaxTextExtent,"%g ",*k++); (void) ConcatenateString(&message,format); @@ -1380,13 +1380,14 @@ MagickExport Image *ConvolveImageChannel(const Image *image, *k; (void) LogMagickEvent(TransformEvent,GetMagickModule(), - " ConvolveImage with %ldx%ld kernel:",width,width); + " ConvolveImage with %lux%lu kernel:",(unsigned long) width, + (unsigned long) width); message=AcquireString(""); k=kernel; for (v=0; v < (ssize_t) width; v++) { *message='\0'; - (void) FormatMagickString(format,MaxTextExtent,"%ld: ",v); + (void) FormatMagickString(format,MaxTextExtent,"%ld: ",(long) v); (void) ConcatenateString(&message,format); for (u=0; u < (ssize_t) width; u++) { @@ -2225,13 +2226,14 @@ MagickExport Image *FilterImageChannel(const Image *image, *k; (void) LogMagickEvent(TransformEvent,GetMagickModule(), - " FilterImage with %ldx%ld kernel:",kernel->width,kernel->height); + " FilterImage with %ldx%ld kernel:",(unsigned long) kernel->width, + (unsigned long) kernel->height); message=AcquireString(""); k=kernel->values; for (v=0; v < (ssize_t) kernel->height; v++) { *message='\0'; - (void) FormatMagickString(format,MaxTextExtent,"%ld: ",v); + (void) FormatMagickString(format,MaxTextExtent,"%ld: ",(long) v); (void) ConcatenateString(&message,format); for (u=0; u < (ssize_t) kernel->width; u++) { @@ -3469,7 +3471,8 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, x=(ssize_t) ((i+1)*thumbnail->columns)/NumberTiles; y=(ssize_t) ((i+1)*thumbnail->rows)/NumberTiles; preview_image=RollImage(thumbnail,x,y,exception); - (void) FormatMagickString(label,MaxTextExtent,"roll %ldx%ld",x,y); + (void) FormatMagickString(label,MaxTextExtent,"roll %ldx%ld",(long) x, + (long) y); break; } case HuePreview: @@ -3521,7 +3524,8 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, if (preview_image != (Image *) NULL) for (x=0; x < i; x++) (void) ContrastImage(preview_image,MagickTrue); - (void) FormatMagickString(label,MaxTextExtent,"contrast (%ld)",i+1); + (void) FormatMagickString(label,MaxTextExtent,"contrast (%ld)",(long) + i+1); break; } case DullPreview: @@ -3531,7 +3535,8 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, break; for (x=0; x < i; x++) (void) ContrastImage(preview_image,MagickFalse); - (void) FormatMagickString(label,MaxTextExtent,"+contrast (%ld)",i+1); + (void) FormatMagickString(label,MaxTextExtent,"+contrast (%ld)", + (long) i+1); break; } case GrayscalePreview: @@ -3544,7 +3549,7 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, quantize_info.colorspace=GRAYColorspace; (void) QuantizeImage(&quantize_info,preview_image); (void) FormatMagickString(label,MaxTextExtent, - "-colorspace gray -colors %ld",colors); + "-colorspace gray -colors %lu",(unsigned long) colors); break; } case QuantizePreview: @@ -3555,7 +3560,8 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, colors<<=1; quantize_info.number_colors=colors; (void) QuantizeImage(&quantize_info,preview_image); - (void) FormatMagickString(label,MaxTextExtent,"colors %ld",colors); + (void) FormatMagickString(label,MaxTextExtent,"colors %lu", + (unsigned long) colors); break; } case DespecklePreview: @@ -3571,7 +3577,8 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, preview_image=DespeckleImage(thumbnail,exception); if (preview_image == (Image *) NULL) break; - (void) FormatMagickString(label,MaxTextExtent,"despeckle (%ld)",i+1); + (void) FormatMagickString(label,MaxTextExtent,"despeckle (%ld)",(long) + i+1); break; } case ReduceNoisePreview: @@ -3693,7 +3700,8 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, geometry.y=i/2; (void) RaiseImage(preview_image,&geometry,MagickTrue); (void) FormatMagickString(label,MaxTextExtent,"raise %lux%lu%+ld%+ld", - geometry.width,geometry.height,geometry.x,geometry.y); + (unsigned long) geometry.width,(unsigned long) geometry.height, + (long) geometry.x,(long) geometry.y); break; } case SegmentPreview: @@ -3760,7 +3768,7 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, break; preview_info->quality=(size_t) percentage; (void) FormatMagickString(factor,MaxTextExtent,"%lu", - preview_info->quality); + (unsigned long) preview_info->quality); file=AcquireUniqueFileResource(filename); if (file != -1) file=close(file)-1; @@ -3793,7 +3801,7 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview, GetBlobSize(preview_image))/1024.0); else (void) FormatMagickString(label,MaxTextExtent,"quality %s\n%lub ", - factor,(size_t) GetBlobSize(thumbnail)); + factor,(unsigned long) GetBlobSize(thumbnail)); break; } } @@ -4508,13 +4516,14 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image, *k; (void) LogMagickEvent(TransformEvent,GetMagickModule(), - " SelectiveBlurImage with %ldx%ld kernel:",width,width); + " SelectiveBlurImage with %lux%lu kernel:",(unsigned long) width, + (unsigned long) width); message=AcquireString(""); k=kernel; for (v=0; v < (ssize_t) width; v++) { *message='\0'; - (void) FormatMagickString(format,MaxTextExtent,"%ld: ",v); + (void) FormatMagickString(format,MaxTextExtent,"%ld: ",(long) v); (void) ConcatenateString(&message,format); for (u=0; u < (ssize_t) width; u++) { diff --git a/magick/identify.c b/magick/identify.c index 94a329b1f..e8ef82649 100644 --- a/magick/identify.c +++ b/magick/identify.c @@ -321,19 +321,22 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, (image->scene == 0)) (void) fprintf(file,"%s ",image->filename); else - (void) fprintf(file,"%s[%lu] ",image->filename,image->scene); + (void) fprintf(file,"%s[%lu] ",image->filename,(unsigned long) + image->scene); (void) fprintf(file,"%s ",image->magick); if ((image->magick_columns != 0) || (image->magick_rows != 0)) if ((image->magick_columns != image->columns) || (image->magick_rows != image->rows)) - (void) fprintf(file,"%lux%lu=>",image->magick_columns, - image->magick_rows); - (void) fprintf(file,"%lux%lu ",image->columns,image->rows); + (void) fprintf(file,"%lux%lu=>",(unsigned long) image->magick_columns, + (unsigned long) image->magick_rows); + (void) fprintf(file,"%lux%lu ",(unsigned long) image->columns, + (unsigned long) image->rows); if ((image->page.width != 0) || (image->page.height != 0) || (image->page.x != 0) || (image->page.y != 0)) - (void) fprintf(file,"%lux%lu%+ld%+ld ",image->page.width, - image->page.height,(long) image->page.x,(long) image->page.y); - (void) fprintf(file,"%lu-bit ",image->depth); + (void) fprintf(file,"%lux%lu%+ld%+ld ",(unsigned long) + image->page.width,(unsigned long) image->page.height,(long) + image->page.x,(long) image->page.y); + (void) fprintf(file,"%lu-bit ",(unsigned long) image->depth); if (image->type != UndefinedType) (void) fprintf(file,"%s ",MagickOptionToMnemonic(MagickTypeOptions, (ssize_t) image->type)); @@ -348,10 +351,11 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, } else if (image->total_colors <= image->colors) - (void) fprintf(file,"PseudoClass %luc ",image->colors); - else - (void) fprintf(file,"PseudoClass %lu=>%luc ",image->total_colors, + (void) fprintf(file,"PseudoClass %luc ",(unsigned long) image->colors); + else + (void) fprintf(file,"PseudoClass %lu=>%luc ",(unsigned long) + image->total_colors,(unsigned long) image->colors); if (image->error.mean_error_per_pixel != 0.0) (void) fprintf(file,"%ld/%f/%fdb ",(long) (image->error.mean_error_per_pixel+0.5), @@ -397,13 +401,14 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, GetMagickDescription(magick_info)); (void) fprintf(file," Class: %s\n",MagickOptionToMnemonic(MagickClassOptions, (ssize_t) image->storage_class)); - (void) fprintf(file," Geometry: %lux%lu%+ld%+ld\n",image->columns, - image->rows,(long) image->tile_offset.x,(long) image->tile_offset.y); + (void) fprintf(file," Geometry: %lux%lu%+ld%+ld\n",(unsigned long) + image->columns,(unsigned long) image->rows,(long) image->tile_offset.x, + (long) image->tile_offset.y); if ((image->magick_columns != 0) || (image->magick_rows != 0)) if ((image->magick_columns != image->columns) || (image->magick_rows != image->rows)) - (void) fprintf(file," Base geometry: %lux%lu\n",image->magick_columns, - image->magick_rows); + (void) fprintf(file," Base geometry: %lux%lu\n",(unsigned long) + image->magick_columns,(unsigned long) image->magick_rows); if ((image->x_resolution != 0.0) && (image->y_resolution != 0.0)) { (void) fprintf(file," Resolution: %gx%g\n",image->x_resolution, @@ -443,9 +448,10 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, } depth=GetImageDepth(image,&image->exception); if (image->depth == depth) - (void) fprintf(file," Depth: %lu-bit\n",image->depth); + (void) fprintf(file," Depth: %lu-bit\n",(unsigned long) image->depth); else - (void) fprintf(file," Depth: %lu/%lu-bit\n",image->depth,depth); + (void) fprintf(file," Depth: %lu/%lu-bit\n",(unsigned long) + image->depth,(unsigned long) depth); (void) fprintf(file," Channel depth:\n"); if (IsGrayImage(image,&image->exception) != MagickFalse) colorspace=GRAYColorspace; @@ -455,38 +461,38 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, default: { (void) fprintf(file," red: %lu-bit\n", - channel_statistics[RedChannel].depth); + (unsigned long) channel_statistics[RedChannel].depth); (void) fprintf(file," green: %lu-bit\n", - channel_statistics[GreenChannel].depth); + (unsigned long) channel_statistics[GreenChannel].depth); (void) fprintf(file," blue: %lu-bit\n", - channel_statistics[BlueChannel].depth); + (unsigned long) channel_statistics[BlueChannel].depth); if (image->matte != MagickFalse) (void) fprintf(file," alpha: %lu-bit\n", - channel_statistics[OpacityChannel].depth); + (unsigned long) channel_statistics[OpacityChannel].depth); break; } case CMYKColorspace: { (void) fprintf(file," cyan: %lu-bit\n", - channel_statistics[CyanChannel].depth); + (unsigned long) channel_statistics[CyanChannel].depth); (void) fprintf(file," magenta: %lu-bit\n", - channel_statistics[MagentaChannel].depth); + (unsigned long) channel_statistics[MagentaChannel].depth); (void) fprintf(file," yellow: %lu-bit\n", - channel_statistics[YellowChannel].depth); + (unsigned long) channel_statistics[YellowChannel].depth); (void) fprintf(file," black: %lu-bit\n", - channel_statistics[BlackChannel].depth); + (unsigned long) channel_statistics[BlackChannel].depth); if (image->matte != MagickFalse) (void) fprintf(file," alpha: %lu-bit\n", - channel_statistics[OpacityChannel].depth); + (unsigned long) channel_statistics[OpacityChannel].depth); break; } case GRAYColorspace: { (void) fprintf(file," gray: %lu-bit\n", - channel_statistics[GrayChannel].depth); + (unsigned long) channel_statistics[GrayChannel].depth); if (image->matte != MagickFalse) (void) fprintf(file," alpha: %lu-bit\n", - channel_statistics[OpacityChannel].depth); + (unsigned long) channel_statistics[OpacityChannel].depth); break; } } @@ -629,8 +635,8 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, artifact=GetImageArtifact(image,"identify:unique-colors"); if ((artifact != (const char *) NULL) && (IsMagickTrue(artifact) != MagickFalse)) - (void) fprintf(file," Colors: %lu\n",GetNumberColors(image, - (FILE *) NULL,&image->exception)); + (void) fprintf(file," Colors: %lu\n",(unsigned long) + GetNumberColors(image,(FILE *) NULL,&image->exception)); if (IsHistogramImage(image,&image->exception) != MagickFalse) { (void) fprintf(file," Histogram:\n"); @@ -639,7 +645,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, } if (image->storage_class == PseudoClass) { - (void) fprintf(file," Colormap: %lu\n",image->colors); + (void) fprintf(file," Colormap: %lu\n",(unsigned long) image->colors); if (image->colors <= 1024) { char @@ -718,8 +724,8 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, image->chromaticity.white_point.x,image->chromaticity.white_point.y); } if ((image->extract_info.width*image->extract_info.height) != 0) - (void) fprintf(file," Tile geometry: %lux%lu%+ld%+ld\n", - image->extract_info.width,image->extract_info.height, + (void) fprintf(file," Tile geometry: %lux%lu%+ld%+ld\n",(unsigned long) + image->extract_info.width,(unsigned long) image->extract_info.height, (long) image->extract_info.x,(long) image->extract_info.y); (void) fprintf(file," Interlace: %s\n",MagickOptionToMnemonic( MagickInterlaceOptions,(ssize_t) image->interlace)); @@ -739,28 +745,30 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, MagickComposeOptions,(ssize_t) image->compose)); if ((image->page.width != 0) || (image->page.height != 0) || (image->page.x != 0) || (image->page.y != 0)) - (void) fprintf(file," Page geometry: %lux%lu%+ld%+ld\n",image->page.width, - image->page.height,(long) image->page.x,(long) image->page.y); + (void) fprintf(file," Page geometry: %lux%lu%+ld%+ld\n",(unsigned long) + image->page.width,(unsigned long) image->page.height,(long) + image->page.x,(long) image->page.y); if ((image->page.x != 0) || (image->page.y != 0)) (void) fprintf(file," Origin geometry: %+ld%+ld\n",(long) image->page.x, (long) image->page.y); (void) fprintf(file," Dispose: %s\n",MagickOptionToMnemonic( MagickDisposeOptions,(ssize_t) image->dispose)); if (image->delay != 0) - (void) fprintf(file," Delay: %lux%ld\n",image->delay, + (void) fprintf(file," Delay: %lux%ld\n",(unsigned long) image->delay, (long) image->ticks_per_second); if (image->iterations != 1) - (void) fprintf(file," Iterations: %lu\n",image->iterations); + (void) fprintf(file," Iterations: %lu\n",(unsigned long) + image->iterations); if ((image->next != (Image *) NULL) || (image->previous != (Image *) NULL)) - (void) fprintf(file," Scene: %lu of %lu\n",image->scene, - GetImageListLength(image)); + (void) fprintf(file," Scene: %lu of %lu\n",(unsigned long) image->scene, + (unsigned long) GetImageListLength(image)); else if (image->scene != 0) - (void) fprintf(file," Scene: %lu\n",image->scene); + (void) fprintf(file," Scene: %lu\n",(unsigned long) image->scene); (void) fprintf(file," Compression: %s\n",MagickOptionToMnemonic( MagickCompressOptions,(ssize_t) image->compression)); if (image->quality != UndefinedCompressionQuality) - (void) fprintf(file," Quality: %lu\n",image->quality); + (void) fprintf(file," Quality: %lu\n",(unsigned long) image->quality); (void) fprintf(file," Orientation: %s\n",MagickOptionToMnemonic( MagickOrientationOptions,(ssize_t) image->orientation)); if (image->montage != (char *) NULL) @@ -802,8 +810,8 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, (void) fprintf(file,"\n"); continue; } - (void) fprintf(file," %lux%lu %s\n",tile->magick_columns, - tile->magick_rows,tile->magick); + (void) fprintf(file," %lux%lu %s\n",(unsigned long) + tile->magick_columns,(unsigned long) tile->magick_rows,tile->magick); (void) SignatureImage(tile); ResetImagePropertyIterator(tile); property=GetNextImageProperty(tile); @@ -869,7 +877,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, profile=GetImageProfile(image,name); if (profile == (StringInfo *) NULL) continue; - (void) fprintf(file," Profile-%s: %lu bytes\n",name,(size_t) + (void) fprintf(file," Profile-%s: %lu bytes\n",name,(unsigned long) GetStringInfoLength(profile)); #if defined(MAGICKCORE_LCMS_DELEGATE) if ((LocaleCompare(name,"icc") == 0) || diff --git a/magick/log.c b/magick/log.c index a267456a7..969964510 100644 --- a/magick/log.c +++ b/magick/log.c @@ -653,7 +653,7 @@ MagickExport MagickBooleanType ListLogInfo(FILE *file,ExceptionInfo *exception) for (j=(ssize_t) strlen(log_info[i]->filename); j <= 16; j++) (void) fprintf(file," "); } - (void) fprintf(file,"%9lu ",log_info[i]->generations); + (void) fprintf(file,"%9lu ",(unsigned long) log_info[i]->generations); (void) FormatMagickSize(MegabytesToBytes(log_info[i]->limit),MagickFalse, limit); (void) fprintf(file,"%8sB ",limit); @@ -840,10 +840,11 @@ static char *TranslateEvent(const LogEventType magick_unused(type), " %lu\n" " %s\n" " %s\n" - "",timestamp,(ssize_t) (elapsed_time/60.0),(ssize_t) - floor(fmod(elapsed_time,60.0)),(ssize_t) (1000.0*(elapsed_time- - floor(elapsed_time))+0.5),user_time,(ssize_t) getpid(), - GetMagickThreadSignature(),module,function,line,domain,event); + "",timestamp,(long) (elapsed_time/60.0),(long) + floor(fmod(elapsed_time,60.0)),(long) (1000.0*(elapsed_time- + floor(elapsed_time))+0.5),user_time,(long) getpid(), + (unsigned long) GetMagickThreadSignature(),module,function, + (unsigned long) line, domain,event); return(text); } /* @@ -930,13 +931,13 @@ static char *TranslateEvent(const LogEventType magick_unused(type), q++; break; } - q+=FormatMagickString(q,extent,"%lu",log_info->generation % - log_info->generations); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) + (log_info->generation % log_info->generations)); break; } case 'l': { - q+=FormatMagickString(q,extent,"%lu",line); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) line); break; } case 'm': @@ -960,14 +961,14 @@ static char *TranslateEvent(const LogEventType magick_unused(type), } case 'p': { - q+=FormatMagickString(q,extent,"%ld",(ssize_t) getpid()); + q+=FormatMagickString(q,extent,"%ld",(long) getpid()); break; } case 'r': { - q+=FormatMagickString(q,extent,"%ld:%02ld.%03ld",(ssize_t) - (elapsed_time/60.0),(ssize_t) floor(fmod(elapsed_time,60.0)), - (ssize_t) (1000.0*(elapsed_time-floor(elapsed_time))+0.5)); + q+=FormatMagickString(q,extent,"%ld:%02ld.%03ld",(long) + (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)), + (long) (1000.0*(elapsed_time-floor(elapsed_time))+0.5)); break; } case 't': @@ -1067,8 +1068,8 @@ static char *TranslateFilename(const LogInfo *log_info) q++; break; } - q+=FormatMagickString(q,extent,"%lu",log_info->generation % - log_info->generations); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) + (log_info->generation % log_info->generations)); break; } case 'n': @@ -1078,7 +1079,7 @@ static char *TranslateFilename(const LogInfo *log_info) } case 'p': { - q+=FormatMagickString(q,extent,"%ld",(ssize_t) getpid()); + q+=FormatMagickString(q,extent,"%ld",(long) getpid()); break; } case 'v': diff --git a/magick/montage.c b/magick/montage.c index 75f5c49aa..2fd3ccfa0 100644 --- a/magick/montage.c +++ b/magick/montage.c @@ -661,10 +661,11 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, &sans,&sans); y_offset+=(ssize_t) title_offset; (void) FormatMagickString(montage->montage,MaxTextExtent,"%ldx%ld%+ld%+ld", - (ssize_t) (extract_info.width+(extract_info.x+border_width)*2), - (ssize_t) (extract_info.height+(extract_info.y+border_width)*2+ - (metrics.ascent-metrics.descent+4)*number_lines+ - (montage_info->shadow != MagickFalse ? 4 : 0)),x_offset,y_offset); + (long) (extract_info.width+(extract_info.x+border_width)*2), + (long) (extract_info.height+(extract_info.y+border_width)*2+ + (long) ((metrics.ascent-metrics.descent+4)*number_lines+ + (montage_info->shadow != MagickFalse ? 4 : 0))),(long) x_offset, + (long) y_offset); *montage->directory='\0'; tile=0; while (tile < MagickMin((ssize_t) tiles_per_page,(ssize_t) number_images)) @@ -697,8 +698,8 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, clone_info->pointsize*=2.0; (void) GetTypeMetrics(image_list[0],clone_info,&metrics); (void) FormatMagickString(geometry,MaxTextExtent,"%lux%lu%+ld%+ld", - montage->columns,(size_t) (metrics.ascent-metrics.descent), - 0L,(ssize_t) extract_info.y+4); + (unsigned long) montage->columns,(unsigned long) (metrics.ascent- + metrics.descent),0L,(long) extract_info.y+4); (void) CloneString(&clone_info->geometry,geometry); (void) CloneString(&clone_info->text,title); (void) AnnotateImage(montage,clone_info); @@ -766,7 +767,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, if (image->gravity != UndefinedGravity) tile_image->gravity=image->gravity; (void) FormatMagickString(tile_geometry,MaxTextExtent,"%lux%lu+0+0", - image->columns,image->rows); + (unsigned long) image->columns,(unsigned long) image->rows); flags=ParseGravityGeometry(tile_image,tile_geometry,&geometry,exception); x=(ssize_t) (geometry.x+border_width); y=(ssize_t) (geometry.y+border_width); @@ -833,12 +834,13 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, Annotate composite tile with label. */ (void) FormatMagickString(geometry,MaxTextExtent, - "%lux%lu%+ld%+ld",(montage_info->frame ? image->columns : - width)-2*border_width,(size_t) (metrics.ascent- - metrics.descent+4)*MultilineCensus(value),x_offset+ - border_width,(montage_info->frame ? y_offset+height+ - border_width+4 : y_offset+extract_info.height+border_width+ - (montage_info->shadow != MagickFalse ? 4 : 0))+bevel_width); + "%lux%lu%+ld%+ld",(unsigned long) ((montage_info->frame ? + image->columns : width)-2*border_width),(unsigned long) + (metrics.ascent-metrics.descent+4)*MultilineCensus(value), + (long) (x_offset+border_width),(long) ((montage_info->frame ? + y_offset+height+border_width+4 : y_offset+extract_info.height+ + border_width+(montage_info->shadow != MagickFalse ? 4 : 0))+ + bevel_width)); (void) CloneString(&draw_info->geometry,geometry); (void) CloneString(&draw_info->text,value); (void) AnnotateImage(montage,draw_info); diff --git a/magick/morphology.c b/magick/morphology.c index fa0739e34..96cc52c81 100644 --- a/magick/morphology.c +++ b/magick/morphology.c @@ -499,7 +499,8 @@ MagickExport KernelInfo *AcquireKernelInfo(const char *kernel_string) /* Error handling -- this is not proper error handling! */ if ( new_kernel == (KernelInfo *) NULL ) { - fprintf(stderr, "Failed to parse kernel number #%lu\n", kernel_number); + fprintf(stderr, "Failed to parse kernel number #%lu\n",(unsigned long) + kernel_number); if ( kernel != (KernelInfo *) NULL ) kernel=DestroyKernelInfo(kernel); return((KernelInfo *) NULL); @@ -2815,6 +2816,7 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType /* Loop 2: iterate over each kernel in a multi-kernel list */ norm_kernel = (KernelInfo *) kernel; + this_kernel = (KernelInfo *) kernel; rflt_kernel = reflected_kernel; kernel_number = 0; while ( norm_kernel != NULL ) { @@ -2906,12 +2908,12 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType if ( verbose == MagickTrue ) { if ( stage_limit > 1 ) (void) FormatMagickString(v_info, MaxTextExtent, "%s:%lu.%lu -> ", - MagickOptionToMnemonic(MagickMorphologyOptions, method), - method_loop, stage_loop ); + MagickOptionToMnemonic(MagickMorphologyOptions, method), + (unsigned long) method_loop,(unsigned long) stage_loop); else if ( primative != method ) (void) FormatMagickString(v_info, MaxTextExtent, "%s:%lu -> ", - MagickOptionToMnemonic(MagickMorphologyOptions, method), - method_loop ); + MagickOptionToMnemonic(MagickMorphologyOptions, method), + (unsigned long) method_loop); else v_info[0] = '\0'; } @@ -2949,7 +2951,8 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType fprintf(stderr, "%s%s%s:%lu.%lu #%lu => Changed %lu", v_info, MagickOptionToMnemonic(MagickMorphologyOptions, primative), ( this_kernel == rflt_kernel ) ? "*" : "", - method_loop+kernel_loop-1, kernel_number, count, changed); + (unsigned long) method_loop+kernel_loop-1,(unsigned long) + kernel_number,(unsigned long) count,(unsigned long) changed); } /* prepare next loop */ { Image *tmp = work_image; /* swap images for iteration */ @@ -2962,7 +2965,7 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType } /* End Loop 4: Iterate the kernel with primative */ if ( verbose == MagickTrue && kernel_changed != changed ) - fprintf(stderr, " Total %lu", kernel_changed); + fprintf(stderr, " Total %lu",(unsigned long) kernel_changed); if ( verbose == MagickTrue && stage_loop < stage_limit ) fprintf(stderr, "\n"); /* add end-of-line before looping */ @@ -3658,14 +3661,13 @@ MagickExport void ShowKernelInfo(KernelInfo *kernel) fprintf(stderr, "Kernel"); if ( kernel->next != (KernelInfo *) NULL ) - fprintf(stderr, " #%lu", c ); + fprintf(stderr, " #%lu", (unsigned long) c ); fprintf(stderr, " \"%s", MagickOptionToMnemonic(MagickKernelOptions, k->type) ); if ( fabs(k->angle) > MagickEpsilon ) fprintf(stderr, "@%lg", k->angle); - fprintf(stderr, "\" of size %lux%lu%+ld%+ld", - k->width, k->height, - k->x, k->y ); + fprintf(stderr, "\" of size %lux%lu%+ld%+ld",(unsigned long) k->width, + (unsigned long) k->height,(long) k->x,(long) k->y); fprintf(stderr, " with values from %.*lg to %.*lg\n", GetMagickPrecision(), k->minimum, @@ -3681,7 +3683,7 @@ MagickExport void ShowKernelInfo(KernelInfo *kernel) fprintf(stderr, " (Sum %.*lg)\n", GetMagickPrecision(), k->positive_range+k->negative_range); for (i=v=0; v < k->height; v++) { - fprintf(stderr, "%2lu:", v ); + fprintf(stderr, "%2lu:", (unsigned long) v ); for (u=0; u < k->width; u++, i++) if ( IsNan(k->values[i]) ) fprintf(stderr," %*s", GetMagickPrecision()+3, "nan"); diff --git a/magick/pixel.h b/magick/pixel.h index 593ba128f..6d13b10a4 100644 --- a/magick/pixel.h +++ b/magick/pixel.h @@ -80,7 +80,7 @@ typedef struct _DoublePixelPacket typedef struct _LongPixelPacket { - size_t + unsigned long red, green, blue, diff --git a/magick/property.c b/magick/property.c index 792b043a4..d7366f90b 100644 --- a/magick/property.c +++ b/magick/property.c @@ -1312,13 +1312,13 @@ static MagickBooleanType GetEXIFProperty(const Image *image, case EXIF_FMT_BYTE: case EXIF_FMT_UNDEFINED: { - EXIFMultipleValues(1,"%lu",(size_t) + EXIFMultipleValues(1,"%lu",(unsigned long) (*(unsigned char *) p1)); break; } case EXIF_FMT_SBYTE: { - EXIFMultipleValues(1,"%ld",(ssize_t) (*(signed char *) p1)); + EXIFMultipleValues(1,"%ld",(long) (*(signed char *) p1)); break; } case EXIF_FMT_SSHORT: @@ -1333,23 +1333,25 @@ static MagickBooleanType GetEXIFProperty(const Image *image, } case EXIF_FMT_ULONG: { - EXIFMultipleValues(4,"%lu",ReadPropertyLong(endian,p1)); + EXIFMultipleValues(4,"%lu",(long) ReadPropertyLong(endian,p1)); break; } case EXIF_FMT_SLONG: { - EXIFMultipleValues(4,"%ld",ReadPropertyLong(endian,p1)); + EXIFMultipleValues(4,"%ld",(long) ReadPropertyLong(endian,p1)); break; } case EXIF_FMT_URATIONAL: { - EXIFMultipleFractions(8,"%ld/%ld",ReadPropertyLong(endian,p1), + EXIFMultipleFractions(8,"%ld/%ld",(long) + ReadPropertyLong(endian,p1),(long) ReadPropertyLong(endian,p1+4)); break; } case EXIF_FMT_SRATIONAL: { - EXIFMultipleFractions(8,"%ld/%ld",ReadPropertyLong(endian,p1), + EXIFMultipleFractions(8,"%ld/%ld",(long) + ReadPropertyLong(endian,p1),(long) ReadPropertyLong(endian,p1+4)); break; } @@ -1424,11 +1426,11 @@ static MagickBooleanType GetEXIFProperty(const Image *image, { if (tag_value < 0x10000) (void) FormatMagickString(key,MaxTextExtent,"#%04lx", - tag_value); + (unsigned long) tag_value); else if (tag_value < 0x20000) (void) FormatMagickString(key,MaxTextExtent,"@%04lx", - tag_value & 0xffff); + (unsigned long) (tag_value & 0xffff)); else (void) FormatMagickString(key,MaxTextExtent,"unknown"); break; @@ -1804,7 +1806,8 @@ static char *TraceSVGClippath(const unsigned char *blob,size_t length, "\n"); (void) ConcatenateString(&path,message); (void) FormatMagickString(message,MaxTextExtent, - "\n",columns,rows); + "\n",(unsigned long) columns, + (unsigned long) rows); (void) ConcatenateString(&path,message); (void) FormatMagickString(message,MaxTextExtent,"\n"); (void) ConcatenateString(&path,message); @@ -2186,7 +2189,8 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info, if (IsGrayImage(image,&image->exception) != MagickFalse) colorspace=GRAYColorspace; (void) FormatMagickString(value,MaxTextExtent,"%s", - MagickOptionToMnemonic(MagickColorspaceOptions,(ssize_t) colorspace)); + MagickOptionToMnemonic(MagickColorspaceOptions,(ssize_t) + colorspace)); break; } break; @@ -2195,7 +2199,8 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info, { if (LocaleNCompare("depth",property,5) == 0) { - (void) FormatMagickString(value,MaxTextExtent,"%lu",image->depth); + (void) FormatMagickString(value,MaxTextExtent,"%lu",(unsigned long) + image->depth); break; } if (LocaleNCompare("directory",property,9) == 0) @@ -2221,7 +2226,7 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info, if (LocaleNCompare("group",property,5) == 0) { (void) FormatMagickString(value,MaxTextExtent,"0x%lx", - image_info->group); + (unsigned long) image_info->group); break; } break; @@ -2335,7 +2340,8 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info, p=image; for (page=1; GetPreviousImageInList(p) != (Image *) NULL; page++) p=GetPreviousImageInList(p); - (void) FormatMagickString(value,MaxTextExtent,"%lu",page); + (void) FormatMagickString(value,MaxTextExtent,"%lu",(unsigned long) + page); break; } break; @@ -2354,15 +2360,16 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info, if (LocaleNCompare("scenes",property,6) == 0) { (void) FormatMagickString(value,MaxTextExtent,"%lu", - (size_t) GetImageListLength(image)); + (unsigned long) GetImageListLength(image)); break; } if (LocaleNCompare("scene",property,5) == 0) { - (void) FormatMagickString(value,MaxTextExtent,"%lu",image->scene); + (void) FormatMagickString(value,MaxTextExtent,"%lu",(unsigned long) + image->scene); if (image_info->number_scenes != 0) (void) FormatMagickString(value,MaxTextExtent,"%lu", - image_info->scene); + (unsigned long) image_info->scene); break; } if (LocaleNCompare("skewness",property,8) == 0) @@ -2406,8 +2413,8 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info, { if (LocaleNCompare("width",property,5) == 0) { - (void) FormatMagickString(value,MaxTextExtent,"%lu", - image->magick_columns != 0 ? image->magick_columns : 256UL); + (void) FormatMagickString(value,MaxTextExtent,"%lu",(unsigned long) + (image->magick_columns != 0 ? image->magick_columns : 256)); break; } break; @@ -2610,7 +2617,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info, /* File size. */ - (void) FormatMagickString(format,MaxTextExtent,"%lu",(size_t) + (void) FormatMagickString(format,MaxTextExtent,"%lu",(unsigned long) image->extent); if (image->extent != (MagickSizeType) ((size_t) image->extent)) (void) FormatMagickSize(image->extent,MagickFalse,format); @@ -2696,8 +2703,9 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info, /* Image geometry. */ - q+=FormatMagickString(q,extent,"%lux%lu%+ld%+ld",image->page.width, - image->page.height,image->page.x,image->page.y); + q+=FormatMagickString(q,extent,"%lux%lu%+ld%+ld",(unsigned long) + image->page.width,(unsigned long) image->page.height,(long) + image->page.x,(long) image->page.y); break; } case 'h': @@ -2705,8 +2713,8 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info, /* Image height. */ - q+=FormatMagickString(q,extent,"%lu",image->rows != 0 ? image->rows : - image->magick_rows); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) + (image->rows != 0 ? image->rows : image->magick_rows)); break; } case 'i': @@ -2722,8 +2730,8 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info, /* Number of unique colors. */ - q+=FormatMagickString(q,extent,"%lu",GetNumberColors(image, - (FILE *) NULL,&image->exception)); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) + GetNumberColors(image,(FILE *) NULL,&image->exception)); break; } case 'l': @@ -2768,7 +2776,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info, /* Number of images in the list. */ - q+=FormatMagickString(q,extent,"%lu",(size_t) + q+=FormatMagickString(q,extent,"%lu",(unsigned long) GetImageListLength(image)); break; } @@ -2794,7 +2802,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info, p=image; for (page=1; GetPreviousImageInList(p) != (Image *) NULL; page++) p=GetPreviousImageInList(p); - q+=FormatMagickString(q,extent,"%lu",page); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) page); break; } case 'q': @@ -2802,7 +2810,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info, /* Image depth. */ - q+=FormatMagickString(q,extent,"%lu",image->depth); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) image->depth); break; } case 'r': @@ -2828,9 +2836,10 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info, Image scene number. */ if (text_info->number_scenes == 0) - q+=FormatMagickString(q,extent,"%lu",image->scene); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) image->scene); else - q+=FormatMagickString(q,extent,"%lu",text_info->scene); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) + text_info->scene); break; } case 'u': @@ -2847,8 +2856,8 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info, /* Image width. */ - q+=FormatMagickString(q,extent,"%lu",image->columns != 0 ? - image->columns : image->magick_columns); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) + (image->columns != 0 ? image->columns : image->magick_columns)); break; } case 'x': @@ -2857,7 +2866,8 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info, Image horizontal resolution. */ q+=FormatMagickString(q,extent,"%g %s",image->x_resolution, - MagickOptionToMnemonic(MagickResolutionOptions,(ssize_t) image->units)); + MagickOptionToMnemonic(MagickResolutionOptions,(ssize_t) + image->units)); break; } case 'y': @@ -2866,7 +2876,8 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info, Image vertical resolution. */ q+=FormatMagickString(q,extent,"%g %s",image->y_resolution, - MagickOptionToMnemonic(MagickResolutionOptions,(ssize_t) image->units)); + MagickOptionToMnemonic(MagickResolutionOptions,(ssize_t) + image->units)); break; } case 'z': @@ -2874,7 +2885,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info, /* Image depth. */ - q+=FormatMagickString(q,extent,"%lu",image->depth); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) image->depth); break; } case 'A': @@ -2906,29 +2917,31 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info, } case 'G': { - q+=FormatMagickString(q,extent,"%lux%lu",image->magick_columns, - image->magick_rows); + q+=FormatMagickString(q,extent,"%lux%lu",(unsigned long) + image->magick_columns,(unsigned long) image->magick_rows); break; } case 'H': { - q+=FormatMagickString(q,extent,"%ld",image->page.height); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) + image->page.height); break; } case 'O': { - q+=FormatMagickString(q,extent,"%+ld%+ld",image->page.x,image->page.y); + q+=FormatMagickString(q,extent,"%+ld%+ld",(long) image->page.x, + (long) image->page.y); break; } case 'P': { - q+=FormatMagickString(q,extent,"%lux%lu",image->page.width, - image->page.height); + q+=FormatMagickString(q,extent,"%lux%lu",(unsigned long) + image->page.width,(unsigned long) image->page.height); break; } case 'Q': { - q+=FormatMagickString(q,extent,"%lu",image->quality); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) image->quality); break; } case 'S': @@ -2939,28 +2952,28 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info, if (text_info->number_scenes == 0) q+=CopyMagickString(q,"2147483647",extent); else - q+=FormatMagickString(q,extent,"%lu",text_info->scene+ - text_info->number_scenes); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) + (text_info->scene+text_info->number_scenes)); break; } case 'T': { - q+=FormatMagickString(q,extent,"%lu",image->delay); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) image->delay); break; } case 'W': { - q+=FormatMagickString(q,extent,"%ld",image->page.width); + q+=FormatMagickString(q,extent,"%lu",(unsigned long) image->page.width); break; } case 'X': { - q+=FormatMagickString(q,extent,"%+ld",image->page.x); + q+=FormatMagickString(q,extent,"%+ld",(long) image->page.x); break; } case 'Y': { - q+=FormatMagickString(q,extent,"%+ld",image->page.y); + q+=FormatMagickString(q,extent,"%+ld",(long) image->page.y); break; } case 'Z': @@ -3098,8 +3111,8 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info, Image bounding box. */ page=GetImageBoundingBox(image,&image->exception); - q+=FormatMagickString(q,MaxTextExtent,"%lux%lu%+ld%+ld",page.width, - page.height,page.x,page.y); + q+=FormatMagickString(q,MaxTextExtent,"%lux%lu%+ld%+ld",(unsigned long) + page.width,(unsigned long) page.height,(long) page.x,(long) page.y); break; } case '#': diff --git a/magick/resize.c b/magick/resize.c index b214903de..cbec4a757 100644 --- a/magick/resize.c +++ b/magick/resize.c @@ -3021,7 +3021,8 @@ MagickExport Image *ThumbnailImage(const Image *image, (void) FormatMagickString(value,MaxTextExtent,"%lu", (unsigned long) image->magick_columns); (void) SetImageProperty(thumbnail_image,"Thumb::Image::Width",value); - (void) FormatMagickString(value,MaxTextExtent,"%lu",image->magick_rows); + (void) FormatMagickString(value,MaxTextExtent,"%lu",(unsigned long) + image->magick_rows); (void) SetImageProperty(thumbnail_image,"Thumb::Image::height",value); (void) FormatMagickString(value,MaxTextExtent,"%lu", (unsigned long) GetImageListLength(image)); diff --git a/magick/resource.c b/magick/resource.c index 8c3fb9e8f..4adba0222 100644 --- a/magick/resource.c +++ b/magick/resource.c @@ -685,7 +685,7 @@ MagickExport MagickBooleanType ListMagickResourceInfo(FILE *file, (void) fprintf(file,"--------------------------------------------------------" "-----------------------\n"); (void) fprintf(file,"%4lu %10sB %10sB %10sB %10sB %6lu %11s\n", - (size_t) resource_info.file_limit,area_limit,memory_limit,map_limit, + (unsigned long) resource_info.file_limit,area_limit,memory_limit,map_limit, disk_limit,(unsigned long) resource_info.thread_limit,time_limit); (void) fflush(file); UnlockSemaphoreInfo(resource_semaphore); diff --git a/magick/widget.c b/magick/widget.c index b1da74d1d..2d7efaec3 100644 --- a/magick/widget.c +++ b/magick/widget.c @@ -2683,7 +2683,7 @@ MagickExport void XColorBrowserWidget(Display *display,XWindows *windows, unsigned char *data; - size_t + unsigned long after, length; @@ -4108,7 +4108,7 @@ MagickExport int XDialogWidget(Display *display,XWindows *windows, unsigned char *data; - size_t + unsigned long after, length; @@ -5326,7 +5326,7 @@ MagickExport void XFileBrowserWidget(Display *display,XWindows *windows, unsigned char *data; - size_t + unsigned long after, length; @@ -6544,7 +6544,7 @@ MagickExport void XFontBrowserWidget(Display *display,XWindows *windows, unsigned char *data; - size_t + unsigned long after, length; @@ -7551,7 +7551,7 @@ MagickExport void XListBrowserWidget(Display *display,XWindows *windows, unsigned char *data; - size_t + unsigned long after, length; @@ -8583,7 +8583,7 @@ MagickExport MagickBooleanType XPreferencesWidget(Display *display, preferences_info[7].raised=resource_info->use_pixmap == MagickFalse ? MagickTrue : MagickFalse; (void) FormatMagickString(cache,MaxTextExtent,CacheButtonText, - resource_info->undo_cache); + (unsigned long) resource_info->undo_cache); XGetWidgetInfo(cache,&cache_info); cache_info.bevel_width--; cache_info.width=(unsigned int) QuantumMargin >> 1; @@ -8657,7 +8657,7 @@ MagickExport MagickBooleanType XPreferencesWidget(Display *display, if (resource_info->undo_cache > 256) resource_info->undo_cache=1; (void) FormatMagickString(cache,MaxTextExtent,CacheButtonText, - resource_info->undo_cache); + (unsigned long) resource_info->undo_cache); cache_info.raised=MagickFalse; XDrawTriangleEast(display,&windows->widget,&cache_info); break; diff --git a/magick/xwindow-private.h b/magick/xwindow-private.h index e0ef0fb89..1282ce3d9 100644 --- a/magick/xwindow-private.h +++ b/magick/xwindow-private.h @@ -208,8 +208,10 @@ typedef struct _XAnnotateInfo typedef struct _XPixelInfo { - size_t - colors, + ssize_t + colors; + + unsigned long *pixels; XColor diff --git a/magick/xwindow.c b/magick/xwindow.c index f6dbf1957..73d1bf865 100644 --- a/magick/xwindow.c +++ b/magick/xwindow.c @@ -350,8 +350,8 @@ MagickExport void DestroyXResources(void) RelinquishMagickMemory(windows->icon_resources); if (windows->icon_pixel != (XPixelInfo *) NULL) { - if (windows->icon_pixel->pixels != (size_t *) NULL) - windows->icon_pixel->pixels=(size_t *) + if (windows->icon_pixel->pixels != (unsigned long *) NULL) + windows->icon_pixel->pixels=(unsigned long *) RelinquishMagickMemory(windows->icon_pixel->pixels); if (windows->icon_pixel->annotate_context != (GC) NULL) XFreeGC(windows->display,windows->icon_pixel->annotate_context); @@ -360,8 +360,8 @@ MagickExport void DestroyXResources(void) } if (windows->pixel_info != (XPixelInfo *) NULL) { - if (windows->pixel_info->pixels != (size_t *) NULL) - windows->pixel_info->pixels=(size_t *) + if (windows->pixel_info->pixels != (unsigned long *) NULL) + windows->pixel_info->pixels=(unsigned long *) RelinquishMagickMemory(windows->pixel_info->pixels); if (windows->pixel_info->annotate_context != (GC) NULL) XFreeGC(windows->display,windows->pixel_info->annotate_context); @@ -1594,7 +1594,7 @@ static Window XClientWindow(Display *display,Window target_window) unsigned char *data; - size_t + unsigned long after, number_items; @@ -1888,7 +1888,7 @@ MagickExport void XDestroyWindowColors(Display *display,Window window) unsigned char *data; - size_t + unsigned long after, length; @@ -2044,9 +2044,10 @@ MagickExport void XDisplayImageInfo(Display *display, undo_image=GetPreviousImageInList(undo_image); } (void) fprintf(file,"Undo Edit Cache\n levels: %u\n",levels); - (void) fprintf(file," bytes: %lumb\n",(size_t) - (bytes+(1 << 19)) >> 20); - (void) fprintf(file," limit: %lumb\n\n",resource_info->undo_cache); + (void) fprintf(file," bytes: %lumb\n",(unsigned long) + ((bytes+(1 << 19)) >> 20)); + (void) fprintf(file," limit: %lumb\n\n",(unsigned long) + resource_info->undo_cache); /* Write info about the image to a file. */ @@ -2838,9 +2839,9 @@ MagickExport void XFreeStandardColormap(Display *display, map_info->colormap=(Colormap) NULL; if (pixel != (XPixelInfo *) NULL) { - if (pixel->pixels != (size_t *) NULL) - pixel->pixels=(size_t *) RelinquishMagickMemory(pixel->pixels); - pixel->pixels=(size_t *) NULL; + if (pixel->pixels != (unsigned long *) NULL) + pixel->pixels=(unsigned long *) RelinquishMagickMemory(pixel->pixels); + pixel->pixels=(unsigned long *) NULL; } } @@ -3038,11 +3039,11 @@ MagickExport void XGetPixelPacket(Display *display, pixel->colors=image->colors; packets=(unsigned int) MagickMax((int) pixel->colors,visual_info->colormap_size)+MaxNumberPens; - if (pixel->pixels != (size_t *) NULL) - pixel->pixels=(size_t *) RelinquishMagickMemory(pixel->pixels); - pixel->pixels=(size_t *) AcquireQuantumMemory(packets, + if (pixel->pixels != (unsigned long *) NULL) + pixel->pixels=(unsigned long *) RelinquishMagickMemory(pixel->pixels); + pixel->pixels=(unsigned long *) AcquireQuantumMemory(packets, sizeof(pixel->pixels)); - if (pixel->pixels == (size_t *) NULL) + if (pixel->pixels == (unsigned long *) NULL) ThrowXWindowFatalException(ResourceLimitFatalError,"UnableToGetPixelInfo", image->filename); /* @@ -5188,13 +5189,13 @@ MagickExport XWindows *XInitializeWindows(Display *display, "MemoryAllocationFailed","..."); windows->map_info->colormap=(Colormap) NULL; windows->icon_map->colormap=(Colormap) NULL; - windows->pixel_info->pixels=(size_t *) NULL; + windows->pixel_info->pixels=(unsigned long *) NULL; windows->pixel_info->annotate_context=(GC) NULL; windows->pixel_info->highlight_context=(GC) NULL; windows->pixel_info->widget_context=(GC) NULL; windows->font_info=(XFontStruct *) NULL; windows->icon_pixel->annotate_context=(GC) NULL; - windows->icon_pixel->pixels=(size_t *) NULL; + windows->icon_pixel->pixels=(unsigned long *) NULL; /* Allocate visual. */ @@ -5834,7 +5835,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, unsigned int scanline_pad; - size_t + unsigned long pixel, *pixels; @@ -5864,8 +5865,8 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, resource_info->image_info->texture != (char *) NULL ? resource_info->image_info->texture : "pattern:checkerboard", MaxTextExtent); - (void) FormatMagickString(size,MaxTextExtent,"%lux%lu",image->columns, - image->rows); + (void) FormatMagickString(size,MaxTextExtent,"%lux%lu",(unsigned long) + image->columns,(unsigned long) image->rows); image_info->size=ConstantString(size); pattern=ReadImage(image_info,&image->exception); image_info=DestroyImageInfo(image_info); @@ -6447,7 +6448,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, unsigned int scanline_pad; - size_t + unsigned long pixel, *pixels; @@ -6477,8 +6478,8 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, resource_info->image_info->texture != (char *) NULL ? resource_info->image_info->texture : "pattern:checkerboard", MaxTextExtent); - (void) FormatMagickString(size,MaxTextExtent,"%lux%lu",image->columns, - image->rows); + (void) FormatMagickString(size,MaxTextExtent,"%lux%lu",(unsigned long) + image->columns,(unsigned long) image->rows); image_info->size=ConstantString(size); pattern=ReadImage(image_info,&image->exception); image_info=DestroyImageInfo(image_info); @@ -7095,7 +7096,7 @@ MagickExport void XMakeMagnifyImage(Display *display,XWindows *windows) while ((1 << i) <= (int) magnify) i++; (void) FormatMagickString(windows->magnify.name,MaxTextExtent, - "Magnify %luX",i); + "Magnify %luX",(unsigned long) i); status=XStringListToTextProperty(&windows->magnify.name,1,&window_name); if (status != False) { @@ -7863,7 +7864,7 @@ MagickExport void XMakeStandardColormap(Display *display, Determine if image colors will "fit" into X server colormap. */ colormap_type=resource_info->colormap; - status=XAllocColorCells(display,colormap,MagickFalse,(size_t *) + status=XAllocColorCells(display,colormap,MagickFalse,(unsigned long *) NULL,0,pixel->pixels,(unsigned int) image->colors); if (status != False) colormap_type=PrivateColormap; @@ -8042,7 +8043,7 @@ MagickExport void XMakeStandardColormap(Display *display, Transfer colors from default to private colormap. */ (void) XAllocColorCells(display,colormap,MagickFalse, - (size_t *) NULL,0,pixel->pixels,(unsigned int) + (unsigned long *) NULL,0,pixel->pixels,(unsigned int) retain_colors); p=colors+image->colors; for (i=0; i < (ssize_t) retain_colors; i++) @@ -8055,7 +8056,7 @@ MagickExport void XMakeStandardColormap(Display *display, number_colors+=retain_colors; } (void) XAllocColorCells(display,colormap,MagickFalse, - (size_t *) NULL,0,pixel->pixels,(unsigned int) + (unsigned long *) NULL,0,pixel->pixels,(unsigned int) image->colors); } /* @@ -9265,7 +9266,7 @@ MagickExport void XUserPreferences(XResourceInfo *resource_info) value=resource_info->gamma_correct ? "True" : "False"; XrmPutStringResource(&preferences_database,specifier,(char *) value); (void) FormatMagickString(specifier,MaxTextExtent,"%s.undoCache",client_name); - (void) FormatMagickString(cache,MaxTextExtent,"%lu", + (void) FormatMagickString(cache,MaxTextExtent,"%lu",(unsigned long) resource_info->undo_cache); XrmPutStringResource(&preferences_database,specifier,cache); (void) FormatMagickString(specifier,MaxTextExtent,"%s.usePixmap",client_name); @@ -9566,7 +9567,7 @@ MagickExport Window XWindowByProperty(Display *display,const Window window, i, number_children; - size_t + unsigned long after, number_items; diff --git a/wand/deprecate.c b/wand/deprecate.c index 8261d7607..ba6e53385 100644 --- a/wand/deprecate.c +++ b/wand/deprecate.c @@ -97,7 +97,7 @@ static MagickWand *CloneMagickWandFromImages(const MagickWand *wand, (void) ResetMagickMemory(clone_wand,0,sizeof(*clone_wand)); clone_wand->id=AcquireWandId(); (void) FormatMagickString(clone_wand->name,MaxTextExtent,"%s-%lu", - MagickWandId,clone_wand->id); + MagickWandId,(unsigned long) clone_wand->id); clone_wand->exception=AcquireExceptionInfo(); InheritException(clone_wand->exception,wand->exception); clone_wand->image_info=CloneImageInfo(wand->image_info); diff --git a/wand/drawing-wand.c b/wand/drawing-wand.c index eb133b85e..7b20033ab 100644 --- a/wand/drawing-wand.c +++ b/wand/drawing-wand.c @@ -563,7 +563,7 @@ WandExport DrawingWand *CloneDrawingWand(const DrawingWand *wand) (void) ResetMagickMemory(clone_wand,0,sizeof(*clone_wand)); clone_wand->id=AcquireWandId(); (void) FormatMagickString(clone_wand->name,MaxTextExtent,"DrawingWand-%lu", - clone_wand->id); + (unsigned long) clone_wand->id); clone_wand->exception=AcquireExceptionInfo(); InheritException(clone_wand->exception,wand->exception); clone_wand->mvg=AcquireString(wand->mvg); @@ -2471,7 +2471,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) child=AddChildToXMLTree(xml_info,"font-weight",0); if (child != (XMLTreeInfo *) NULL) { - (void) FormatMagickString(value,MaxTextExtent,"%lu", + (void) FormatMagickString(value,MaxTextExtent,"%lu",(unsigned long) CurrentContext->weight); (void) SetXMLTreeContent(child,value); } @@ -2537,13 +2537,14 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand) if (child != (XMLTreeInfo *) NULL) { (void) CopyMagickString(value,MagickOptionToMnemonic( - MagickLineJoinOptions,(ssize_t) CurrentContext->linejoin),MaxTextExtent); + MagickLineJoinOptions,(ssize_t) CurrentContext->linejoin), + MaxTextExtent); (void) SetXMLTreeContent(child,value); } child=AddChildToXMLTree(xml_info,"stroke-miterlimit",0); if (child != (XMLTreeInfo *) NULL) { - (void) FormatMagickString(value,MaxTextExtent,"%lu", + (void) FormatMagickString(value,MaxTextExtent,"%lu",(unsigned long) CurrentContext->miterlimit); (void) SetXMLTreeContent(child,value); } @@ -4027,8 +4028,9 @@ WandExport MagickBooleanType DrawPopPattern(DrawingWand *wand) (void) FormatMagickString(key,MaxTextExtent,"%s",wand->pattern_id); (void) SetImageArtifact(wand->image,key,wand->mvg+wand->pattern_offset); (void) FormatMagickString(geometry,MaxTextExtent,"%lux%lu%+ld%+ld", - wand->pattern_bounds.width,wand->pattern_bounds.height, - wand->pattern_bounds.x,wand->pattern_bounds.y); + (unsigned long) wand->pattern_bounds.width,(unsigned long) + wand->pattern_bounds.height,(long) wand->pattern_bounds.x, + (long) wand->pattern_bounds.y); (void) SetImageArtifact(wand->image,key,geometry); wand->pattern_id=DestroyString(wand->pattern_id); wand->pattern_offset=0; @@ -5123,7 +5125,7 @@ WandExport void DrawSetFontWeight(DrawingWand *wand, (CurrentContext->weight != font_weight)) { CurrentContext->weight=font_weight; - (void) MvgPrintf(wand,"font-weight %lu\n",font_weight); + (void) MvgPrintf(wand,"font-weight %lu\n",(unsigned long) font_weight); } } @@ -5608,7 +5610,8 @@ WandExport void DrawSetStrokeMiterLimit(DrawingWand *wand, if (CurrentContext->miterlimit != miterlimit) { CurrentContext->miterlimit=miterlimit; - (void) MvgPrintf(wand,"stroke-miterlimit %lu\n",miterlimit); + (void) MvgPrintf(wand,"stroke-miterlimit %lu\n",(unsigned long) + miterlimit); } } @@ -6507,7 +6510,8 @@ WandExport void DrawSetViewbox(DrawingWand *wand,size_t x1, assert(wand->signature == WandSignature); if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - (void) MvgPrintf(wand,"viewbox %lu %lu %lu %lu\n",x1,y1,x2,y2); + (void) MvgPrintf(wand,"viewbox %lu %lu %lu %lu\n",(unsigned long) x1, + (unsigned long) y1,(unsigned long) x2,(unsigned long) y2); } /* @@ -6583,7 +6587,7 @@ WandExport DrawingWand *NewDrawingWand(void) (void) ResetMagickMemory(wand,0,sizeof(*wand)); wand->id=AcquireWandId(); (void) FormatMagickString(wand->name,MaxTextExtent,"%s-%lu",DrawingWandId, - wand->id); + (unsigned long) wand->id); if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); wand->mvg=(char *) NULL; diff --git a/wand/magick-image.c b/wand/magick-image.c index 99557a3b3..ee98cdef2 100644 --- a/wand/magick-image.c +++ b/wand/magick-image.c @@ -106,7 +106,7 @@ static MagickWand *CloneMagickWandFromImages(const MagickWand *wand, (void) ResetMagickMemory(clone_wand,0,sizeof(*clone_wand)); clone_wand->id=AcquireWandId(); (void) FormatMagickString(clone_wand->name,MaxTextExtent,"%s-%lu", - MagickWandId,clone_wand->id); + MagickWandId,(unsigned long) clone_wand->id); clone_wand->exception=AcquireExceptionInfo(); InheritException(clone_wand->exception,wand->exception); clone_wand->image_info=CloneImageInfo(wand->image_info); diff --git a/wand/magick-property.c b/wand/magick-property.c index 0a5f3004c..0ebfdb044 100644 --- a/wand/magick-property.c +++ b/wand/magick-property.c @@ -2504,7 +2504,7 @@ WandExport MagickBooleanType MagickSetPage(MagickWand *wand, if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); (void) FormatMagickString(geometry,MaxTextExtent,"%lux%lu%+ld%+ld", - width,height,x,y); + (unsigned long) width,(unsigned long) height,(long) x,(long) y); (void) CloneString(&wand->image_info->page,geometry); return(MagickTrue); } @@ -2806,7 +2806,8 @@ WandExport MagickBooleanType MagickSetSize(MagickWand *wand, assert(wand->signature == WandSignature); if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - (void) FormatMagickString(geometry,MaxTextExtent,"%lux%lu",columns,rows); + (void) FormatMagickString(geometry,MaxTextExtent,"%lux%lu",(unsigned long) + columns,(unsigned long) rows); (void) CloneString(&wand->image_info->size,geometry); return(MagickTrue); } @@ -2852,8 +2853,8 @@ WandExport MagickBooleanType MagickSetSizeOffset(MagickWand *wand, assert(wand->signature == WandSignature); if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - (void) FormatMagickString(geometry,MaxTextExtent,"%lux%lu%+ld",columns,rows, - offset); + (void) FormatMagickString(geometry,MaxTextExtent,"%lux%lu%+ld", + (unsigned long) columns,(unsigned long) rows,(long) offset); (void) CloneString(&wand->image_info->size,geometry); return(MagickTrue); } diff --git a/wand/magick-wand.c b/wand/magick-wand.c index 8f8e5164e..a186ed3d6 100644 --- a/wand/magick-wand.c +++ b/wand/magick-wand.c @@ -136,7 +136,7 @@ WandExport MagickWand *CloneMagickWand(const MagickWand *wand) (void) ResetMagickMemory(clone_wand,0,sizeof(*clone_wand)); clone_wand->id=AcquireWandId(); (void) FormatMagickString(clone_wand->name,MaxTextExtent,"%s-%lu", - MagickWandId,clone_wand->id); + MagickWandId,(unsigned long) clone_wand->id); clone_wand->exception=AcquireExceptionInfo(); InheritException(clone_wand->exception,wand->exception); clone_wand->image_info=CloneImageInfo(wand->image_info); @@ -1035,7 +1035,7 @@ WandExport MagickWand *NewMagickWand(void) (void) ResetMagickMemory(wand,0,sizeof(*wand)); wand->id=AcquireWandId(); (void) FormatMagickString(wand->name,MaxTextExtent,"%s-%lu",MagickWandId, - wand->id); + (unsigned long) wand->id); wand->exception=AcquireExceptionInfo(); wand->image_info=AcquireImageInfo(); wand->quantize_info=CloneQuantizeInfo((QuantizeInfo *) NULL); diff --git a/wand/mogrify.c b/wand/mogrify.c index aab7c82d4..07e813930 100644 --- a/wand/mogrify.c +++ b/wand/mogrify.c @@ -220,7 +220,7 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info, elapsed_time=GetElapsedTime(timer); user_time=GetUserTime(timer); (void) fprintf(stderr, - "Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n", + "Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",(unsigned long) iterations,1.0*iterations/elapsed_time,user_time,(long) (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)), (long) (1000.0*(elapsed_time-floor(elapsed_time)))); @@ -336,10 +336,10 @@ static MagickBooleanType MonitorProgress(const char *text, locale_message=tag; if (p == (char *) NULL) (void) fprintf(stderr,"%s: %ld of %lu, %02ld%% complete\r",locale_message, - (long) offset,(size_t) extent,(long) (100L*offset/(extent-1))); + (long) offset,(unsigned long) extent,(long) (100L*offset/(extent-1))); else (void) fprintf(stderr,"%s[%s]: %ld of %lu, %02ld%% complete\r", - locale_message,p+1,(long) offset,(size_t) extent,(long) + locale_message,p+1,(long) offset,(unsigned long) extent,(long) (100L*offset/(extent-1))); if (offset == (MagickOffsetType) (extent-1)) (void) fprintf(stderr,"\n"); @@ -7155,10 +7155,11 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info, flags=ParseAbsoluteGeometry(canonical_page,&geometry); canonical_page=DestroyString(canonical_page); (void) FormatMagickString(page,MaxTextExtent,"%lux%lu", - geometry.width,geometry.height); + (unsigned long) geometry.width,(unsigned long) geometry.height); if (((flags & XValue) != 0) || ((flags & YValue) != 0)) (void) FormatMagickString(page,MaxTextExtent,"%lux%lu%+ld%+ld", - geometry.width,geometry.height,geometry.x,geometry.y); + (unsigned long) geometry.width,(unsigned long) geometry.height, + (long) geometry.x,(long) geometry.y); (void) SetImageOption(image_info,option+1,page); (void) CloneString(&image_info->page,page); break; diff --git a/wand/montage.c b/wand/montage.c index e3d901215..33f32196b 100644 --- a/wand/montage.c +++ b/wand/montage.c @@ -408,7 +408,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, image_info->filename,(int) scene,filename); if (LocaleCompare(filename,image_info->filename) == 0) (void) FormatMagickString(filename,MaxTextExtent,"%s.%lu", - image_info->filename,scene); + image_info->filename,(unsigned long) scene); (void) CopyMagickString(image_info->filename,filename, MaxTextExtent); } diff --git a/wand/pixel-iterator.c b/wand/pixel-iterator.c index 91a7d0daa..3a8f00e1c 100644 --- a/wand/pixel-iterator.c +++ b/wand/pixel-iterator.c @@ -162,14 +162,15 @@ WandExport PixelIterator *ClonePixelIterator(const PixelIterator *iterator) assert(iterator->signature == WandSignature); if (iterator->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name); - clone_iterator=(PixelIterator *) AcquireAlignedMemory(1,sizeof(*clone_iterator)); + clone_iterator=(PixelIterator *) AcquireAlignedMemory(1, + sizeof(*clone_iterator)); if (clone_iterator == (PixelIterator *) NULL) ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed", iterator->name); (void) ResetMagickMemory(clone_iterator,0,sizeof(*clone_iterator)); clone_iterator->id=AcquireWandId(); (void) FormatMagickString(clone_iterator->name,MaxTextExtent,"%s-%lu", - PixelIteratorId,clone_iterator->id); + PixelIteratorId,(unsigned long) clone_iterator->id); clone_iterator->exception=AcquireExceptionInfo(); InheritException(clone_iterator->exception,iterator->exception); clone_iterator->view=CloneCacheView(iterator->view); @@ -319,7 +320,7 @@ WandExport PixelIterator *NewPixelIterator(MagickWand *wand) (void) ResetMagickMemory(iterator,0,sizeof(*iterator)); iterator->id=AcquireWandId(); (void) FormatMagickString(iterator->name,MaxTextExtent,"%s-%lu", - PixelIteratorId,iterator->id); + PixelIteratorId,(unsigned long) iterator->id); iterator->exception=AcquireExceptionInfo(); iterator->view=view; SetGeometry(image,&iterator->region); @@ -434,7 +435,7 @@ WandExport PixelIterator *NewPixelRegionIterator(MagickWand *wand,const ssize_t (void) ResetMagickMemory(iterator,0,sizeof(*iterator)); iterator->id=AcquireWandId(); (void) FormatMagickString(iterator->name,MaxTextExtent,"%s-%lu", - PixelIteratorId,iterator->id); + PixelIteratorId,(unsigned long) iterator->id); iterator->exception=AcquireExceptionInfo(); iterator->view=view; SetGeometry(image,&iterator->region); diff --git a/wand/pixel-view.c b/wand/pixel-view.c index 6621aec35..93ff5fbf4 100644 --- a/wand/pixel-view.c +++ b/wand/pixel-view.c @@ -134,7 +134,7 @@ WandExport PixelView *ClonePixelView(const PixelView *pixel_view) (void) ResetMagickMemory(clone_view,0,sizeof(*clone_view)); clone_view->id=AcquireWandId(); (void) FormatMagickString(clone_view->name,MaxTextExtent,"%s-%lu",PixelViewId, - clone_view->id); + (unsigned long) clone_view->id); clone_view->exception=AcquireExceptionInfo(); InheritException(clone_view->exception,pixel_view->exception); clone_view->view=CloneCacheView(pixel_view->view); @@ -849,7 +849,7 @@ WandExport PixelView *NewPixelView(MagickWand *wand) (void) ResetMagickMemory(pixel_view,0,sizeof(*pixel_view)); pixel_view->id=AcquireWandId(); (void) FormatMagickString(pixel_view->name,MaxTextExtent,"%s-%lu", - PixelViewId,pixel_view->id); + PixelViewId,(unsigned long) pixel_view->id); pixel_view->exception=AcquireExceptionInfo(); pixel_view->wand=wand; pixel_view->view=AcquireCacheView(pixel_view->wand->images); @@ -908,7 +908,7 @@ WandExport PixelView *NewPixelViewRegion(MagickWand *wand,const ssize_t x, (void) ResetMagickMemory(pixel_view,0,sizeof(*pixel_view)); pixel_view->id=AcquireWandId(); (void) FormatMagickString(pixel_view->name,MaxTextExtent,"%s-%lu", - PixelViewId,pixel_view->id); + PixelViewId,(unsigned long) pixel_view->id); pixel_view->exception=AcquireExceptionInfo(); pixel_view->view=AcquireCacheView(pixel_view->wand->images); pixel_view->wand=wand; diff --git a/wand/pixel-wand.c b/wand/pixel-wand.c index 3c8f32346..1b92bcf77 100644 --- a/wand/pixel-wand.c +++ b/wand/pixel-wand.c @@ -155,7 +155,7 @@ WandExport PixelWand *ClonePixelWand(const PixelWand *wand) (void) ResetMagickMemory(clone_wand,0,sizeof(*clone_wand)); clone_wand->id=AcquireWandId(); (void) FormatMagickString(clone_wand->name,MaxTextExtent,"%s-%lu",PixelWandId, - clone_wand->id); + (unsigned long) clone_wand->id); clone_wand->exception=AcquireExceptionInfo(); InheritException(clone_wand->exception,wand->exception); clone_wand->pixel=wand->pixel; @@ -407,7 +407,7 @@ WandExport PixelWand *NewPixelWand(void) (void) ResetMagickMemory(wand,0,sizeof(*wand)); wand->id=AcquireWandId(); (void) FormatMagickString(wand->name,MaxTextExtent,"%s-%lu",PixelWandId, - wand->id); + (unsigned long) wand->id); wand->exception=AcquireExceptionInfo(); GetMagickPixelPacket((Image *) NULL,&wand->pixel); wand->debug=IsEventLogging();