From f1d91246f9ab47d524abc076c6ead91e5cc27d03 Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 28 May 2010 02:23:19 +0000 Subject: [PATCH] --- coders/jp2.c | 6 +++--- coders/png.c | 28 +++++++++++++--------------- coders/tiff.c | 2 +- coders/wmf.c | 6 +++--- coders/wpg.c | 2 +- coders/xbm.c | 20 ++++++++++++++------ coders/xps.c | 10 +++++----- magick/blob.c | 6 +++--- magick/cache.c | 26 +++++++++++++++----------- magick/color.c | 4 ++-- magick/exception.c | 4 ++-- magick/fx.c | 7 ++++--- magick/module.c | 6 +++--- magick/quantize.c | 4 ++-- magick/resize.c | 9 +++++---- magick/resource.c | 4 ++-- magick/segment.c | 2 +- magick/shear.c | 3 ++- magick/string.c | 9 +++++---- magick/threshold.c | 2 +- magick/type.c | 3 ++- magick/utility.c | 4 ++-- 22 files changed, 91 insertions(+), 76 deletions(-) diff --git a/coders/jp2.c b/coders/jp2.c index 473e5bf36..eda6af30c 100644 --- a/coders/jp2.c +++ b/coders/jp2.c @@ -244,13 +244,13 @@ static int BlobWrite(jas_stream_obj_t *object,char *buffer,const int length) return((int) count); } -static ssize_t BlobSeek(jas_stream_obj_t *object,ssize_t offset,int origin) +static long BlobSeek(jas_stream_obj_t *object,long offset,int origin) { StreamManager *source; source=(StreamManager *) object; - return((ssize_t) SeekBlob(source->image,offset,origin)); + return((long) SeekBlob(source->image,offset,origin)); } static int BlobClose(jas_stream_obj_t *object) @@ -614,7 +614,7 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception) blob=(jas_stream_memobj_t *) icc_stream->obj_; if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - "Profile: ICC, %lu bytes",(size_t) blob->len_); + "Profile: ICC, %lu bytes",(unsigned long) blob->len_); profile=AcquireStringInfo(blob->len_); SetStringInfoDatum(profile,blob->buf_); icc_profile=(StringInfo *) GetImageProfile(image,"icc"); diff --git a/coders/png.c b/coders/png.c index b87ea6ac8..5fe83d149 100644 --- a/coders/png.c +++ b/coders/png.c @@ -8561,7 +8561,7 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Skipping %c%c%c%c chunk, length=%lu.", - *(p),*(p+1),*(p+2),*(p+3),len); + *(p),*(p+1),*(p+2),*(p+3),(unsigned long) len); } p+=(8+len); } @@ -8571,8 +8571,7 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, /* Write JDAA chunk header */ if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Write JDAA chunk, length=%lu.", - (size_t) length); + " Write JDAA chunk, length=%lu.",(unsigned long) length); (void) WriteBlobMSBULong(image,(size_t) length); PNGType(chunk,mng_JDAA); LogPNGChunk((int) logging,mng_JDAA,length); @@ -8611,8 +8610,8 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Created jpeg_image, %lu x %lu.",jpeg_image->columns, - jpeg_image->rows); + " Created jpeg_image, %lu x %lu.",(unsigned long) jpeg_image->columns, + (unsigned long) jpeg_image->rows); if (jng_color_type == 8 || jng_color_type == 12) jpeg_image_info->type=GrayscaleType; @@ -8627,11 +8626,10 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, { (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Successfully read jpeg_image into a blob, length=%lu.", - (size_t) length); + (unsigned long) length); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Write JDAT chunk, length=%lu.", - (size_t) length); + " Write JDAT chunk, length=%lu.",(unsigned long) length); } /* Write JDAT chunk(s) */ (void) WriteBlobMSBULong(image,(size_t) length); @@ -8871,7 +8869,7 @@ static MagickBooleanType WriteMNGImage(const ImageInfo *image_info,Image *image) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Optimize: FALSE"); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Image_info depth: %ld",image_info->depth); + " Image_info depth: %lu",(unsigned long) image_info->depth); (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Type: %d",image_info->type); @@ -8879,9 +8877,9 @@ static MagickBooleanType WriteMNGImage(const ImageInfo *image_info,Image *image) for (p=image; p != (Image *) NULL; p=GetNextImageInList(p)) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Scene: %ld",scene++); + " Scene: %lu",(unsigned long) scene++); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Image depth: %lu",p->depth); + " Image depth: %lu",(unsigned long) p->depth); if (p->matte) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Matte: True"); @@ -8896,7 +8894,7 @@ static MagickBooleanType WriteMNGImage(const ImageInfo *image_info,Image *image) " Storage class: DirectClass"); if (p->colors) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Number of colors: %lu",p->colors); + " Number of colors: %lu",(unsigned long) p->colors); else (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Number of colors: unspecified"); @@ -9230,14 +9228,14 @@ static MagickBooleanType WriteMNGImage(const ImageInfo *image_info,Image *image) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), " TERM delay: %lu", - (size_t) (mng_info->ticks_per_second* + (unsigned long) (mng_info->ticks_per_second* final_delay/MagickMax(image->ticks_per_second,1))); if (image->iterations == 0) (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " TERM iterations: %lu",(size_t) PNG_UINT_31_MAX); + " TERM iterations: %lu",(unsigned long) PNG_UINT_31_MAX); else (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Image iterations: %lu",image->iterations); + " Image iterations: %lu",(unsigned long) image->iterations); } (void) WriteBlob(image,14,chunk); (void) WriteBlobMSBULong(image,crc32(0,chunk,14)); diff --git a/coders/tiff.c b/coders/tiff.c index 0d4c6a739..7ccf30146 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -928,7 +928,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, image->depth=(size_t) bits_per_sample; if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(),"Image depth: %lu", - image->depth); + (unsigned long) image->depth); lsb_first=1; image->endian=MSBEndian; if ((int) (*(char *) &lsb_first) != 0) diff --git a/coders/wmf.c b/coders/wmf.c index b0a6e80bd..6df1271d4 100644 --- a/coders/wmf.c +++ b/coders/wmf.c @@ -99,14 +99,14 @@ static int WMFReadBlob(void *image) return(ReadBlobByte((Image *) image)); } -static int WMFSeekBlob(void *image,ssize_t offset) +static int WMFSeekBlob(void *image,long offset) { return((int) SeekBlob((Image *) image,(MagickOffsetType) offset,SEEK_SET)); } -static ssize_t WMFTellBlob(void *image) +static long WMFTellBlob(void *image) { - return((ssize_t) TellBlob((Image*) image)); + return((long) TellBlob((Image*) image)); } static Image *ReadWMFImage(const ImageInfo *image_info,ExceptionInfo *exception) diff --git a/coders/wpg.c b/coders/wpg.c index 411be695d..29ebefe1b 100644 --- a/coders/wpg.c +++ b/coders/wpg.c @@ -598,7 +598,7 @@ static int UnpackWPG2Raster(Image *image,int bpp) { (void) fprintf(stderr, "\nUnsupported WPG2 unaligned token RST x=%lu, please report!\n" - ,x); + ,(unsigned long) x); return(-3); } { diff --git a/coders/xbm.c b/coders/xbm.c index 11674957a..4aef1fcb8 100644 --- a/coders/xbm.c +++ b/coders/xbm.c @@ -203,6 +203,10 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception) value, version; + unsigned long + height, + width; + /* Open image file. */ @@ -223,16 +227,20 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Read X bitmap header. */ + width=0; + height=0; while (ReadBlobString(image,buffer) != (char *) NULL) - if (sscanf(buffer,"#define %s %lu",name,&image->columns) == 2) + if (sscanf(buffer,"#define %s %lu",name,&width) == 2) if ((strlen(name) >= 6) && (LocaleCompare(name+strlen(name)-6,"_width") == 0)) - break; + break; while (ReadBlobString(image,buffer) != (char *) NULL) - if (sscanf(buffer,"#define %s %lu",name,&image->rows) == 2) + if (sscanf(buffer,"#define %s %lu",name,&height) == 2) if ((strlen(name) >= 7) && (LocaleCompare(name+strlen(name)-7,"_height") == 0)) - break; + break; + image->columns=width; + image->rows=width; image->depth=8; image->storage_class=PseudoClass; image->colors=2; @@ -509,10 +517,10 @@ static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image) */ GetPathComponent(image->filename,BasePath,basename); (void) FormatMagickString(buffer,MaxTextExtent,"#define %s_width %lu\n", - basename,image->columns); + basename,(unsigned long) image->columns); (void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer); (void) FormatMagickString(buffer,MaxTextExtent,"#define %s_height %lu\n", - basename,image->rows); + basename,(unsigned long) image->rows); (void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer); (void) FormatMagickString(buffer,MaxTextExtent, "static char %s_bits[] = {\n",basename); diff --git a/coders/xps.c b/coders/xps.c index 29b9359b9..3493b86bf 100644 --- a/coders/xps.c +++ b/coders/xps.c @@ -264,7 +264,7 @@ static Image *ReadXPSImage(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("xps:mono",(char *) NULL,exception); else @@ -283,7 +283,7 @@ static Image *ReadXPSImage(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'; @@ -291,11 +291,11 @@ static Image *ReadXPSImage(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'; diff --git a/magick/blob.c b/magick/blob.c index 000bedb5b..932d8004d 100644 --- a/magick/blob.c +++ b/magick/blob.c @@ -2351,10 +2351,10 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info, GetPathComponent(image->filename,ExtensionPath,extension); if (*extension == '\0') (void) FormatMagickString(filename,MaxTextExtent,"%s-%lu", - path,image->scene); + path,(unsigned long) image->scene); else (void) FormatMagickString(filename,MaxTextExtent, - "%s-%lu.%s",path,image->scene,extension); + "%s-%lu.%s",path,(unsigned long) image->scene,extension); } (void) CopyMagickString(image->filename,filename,MaxTextExtent); #if defined(macintosh) @@ -2416,7 +2416,7 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info, count=fread(magick,1,sizeof(magick),image->blob->file); (void) rewind(image->blob->file); (void) LogMagickEvent(BlobEvent,GetMagickModule(), - " read %ld magic header bytes",(ssize_t) count); + " read %lu magic header bytes",(unsigned long) count); #if defined(MAGICKCORE_ZLIB_DELEGATE) if (((int) magick[0] == 0x1F) && ((int) magick[1] == 0x8B) && ((int) magick[2] == 0x08)) diff --git a/magick/cache.c b/magick/cache.c index 750b570ef..4f1798dcc 100644 --- a/magick/cache.c +++ b/magick/cache.c @@ -4077,8 +4077,8 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode, cache_info=(CacheInfo *) image->cache; source_info=(*cache_info); source_info.file=(-1); - (void) FormatMagickString(cache_info->filename,MaxTextExtent,"%s[%ld]", - image->filename,GetImageIndexInList(image)); + (void) FormatMagickString(cache_info->filename,MaxTextExtent,"%s[%lu]", + image->filename,(unsigned long) GetImageIndexInList(image)); cache_info->mode=mode; cache_info->rows=image->rows; cache_info->columns=image->columns; @@ -4127,7 +4127,8 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode, (void) FormatMagickString(message,MaxTextExtent, "open %s (%s memory, %lux%lu %sB)",cache_info->filename, cache_info->mapped != MagickFalse ? "anonymous" : "heap", - cache_info->columns,cache_info->rows,format); + (unsigned long) cache_info->columns,(unsigned long) + cache_info->rows,format); (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s", message); } @@ -4220,8 +4221,8 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode, (void) FormatMagickString(message,MaxTextExtent, "open %s (%s[%d], memory-mapped, %lux%lu %sB)", cache_info->filename,cache_info->cache_filename, - cache_info->file,cache_info->columns,cache_info->rows, - format); + cache_info->file,(unsigned long) cache_info->columns, + (unsigned long) cache_info->rows,format); (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s", message); } @@ -4733,8 +4734,9 @@ static MagickBooleanType ReadPixelCacheIndexes(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); } @@ -4863,8 +4865,9 @@ static MagickBooleanType ReadPixelCachePixels(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); } @@ -5577,7 +5580,8 @@ static MagickBooleanType WritePixelCachePixels(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/color.c b/magick/color.c index a98b06d55..68eb0d843 100644 --- a/magick/color.c +++ b/magick/color.c @@ -1026,7 +1026,7 @@ MagickExport void ConcatenateColorComponent(const MagickPixelPacket *pixel, if (pixel->depth > 16) { (void) FormatMagickString(component,MaxTextExtent,"%10lu", - (size_t) ScaleQuantumToLong(ClampToQuantum(color))); + (unsigned long) ScaleQuantumToLong(ClampToQuantum(color))); (void) ConcatenateMagickString(tuple,component,MaxTextExtent); return; } @@ -1329,7 +1329,7 @@ static void ConcatentateHexColorComponent(const MagickPixelPacket *pixel, if (pixel->depth > 32) { (void) FormatMagickString(component,MaxTextExtent,"%08lX", - ScaleQuantumToLong(ClampToQuantum(color))); + (unsigned long) ScaleQuantumToLong(ClampToQuantum(color))); (void) ConcatenateMagickString(tuple,component,MaxTextExtent); return; } diff --git a/magick/exception.c b/magick/exception.c index ae5e85180..18e09a321 100644 --- a/magick/exception.c +++ b/magick/exception.c @@ -981,8 +981,8 @@ MagickExport MagickBooleanType ThrowMagickExceptionList( type="error"; if (severity >= FatalErrorException) type="fatal"; - (void) FormatMagickString(message,MaxTextExtent,"%s @ %s/%s/%s/%ld",reason, - type,path,function,line); + (void) FormatMagickString(message,MaxTextExtent,"%s @ %s/%s/%s/%lu",reason, + type,path,function,(unsigned long) line); (void) ThrowException(exception,severity,message,(char *) NULL); return(status); } diff --git a/magick/fx.c b/magick/fx.c index a72c78647..8aa9ba4a1 100644 --- a/magick/fx.c +++ b/magick/fx.c @@ -919,7 +919,7 @@ MagickExport Image *ColorMatrixImage(const Image *image, for (v=0; v < 6; v++) { *message='\0'; - (void) FormatMagickString(format,MaxTextExtent,"%ld: ",v); + (void) FormatMagickString(format,MaxTextExtent,"%ld: ",(long) v); (void) ConcatenateString(&message,format); for (u=0; u < 6; u++) { @@ -1154,7 +1154,7 @@ static MagickRealType FxChannelStatistics(FxInfo *fx_info,const Image *image, default: break; } (void) FormatMagickString(key,MaxTextExtent,"%p.%ld.%s",(void *) image, - (ssize_t) channel,symbol); + (long) channel,symbol); value=(const char *) GetValueFromSplayTree(fx_info->symbols,key); if (value != (const char *) NULL) return(QuantumScale*StringToDouble(value)); @@ -1165,7 +1165,8 @@ static MagickRealType FxChannelStatistics(FxInfo *fx_info,const Image *image, depth; depth=GetImageChannelDepth(image,channel,exception); - (void) FormatMagickString(statistic,MaxTextExtent,"%lu",depth); + (void) FormatMagickString(statistic,MaxTextExtent,"%lu", + (unsigned long) depth); } if (LocaleNCompare(symbol,"kurtosis",8) == 0) { diff --git a/magick/module.c b/magick/module.c index fa5108d73..52ccb5a7f 100644 --- a/magick/module.c +++ b/magick/module.c @@ -1007,8 +1007,8 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag, tag); if (signature != MagickImageFilterSignature) (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, - "ImageFilterSignatureMismatch","`%s': %8lx != %8lx",tag,signature, - MagickImageFilterSignature); + "ImageFilterSignatureMismatch","`%s': %8lx != %8lx",tag, + (unsigned long) signature,(unsigned long) MagickImageFilterSignature); } /* Close the module. @@ -1268,7 +1268,7 @@ MagickExport MagickBooleanType OpenModule(const char *module, { (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, "ImageCoderSignatureMismatch","`%s': %8lx != %8lx",module_name, - signature,MagickImageCoderSignature); + (unsigned long) signature,(unsigned long) MagickImageCoderSignature); return(MagickFalse); } return(MagickTrue); diff --git a/magick/quantize.c b/magick/quantize.c index 971404f02..3ea9a1158 100644 --- a/magick/quantize.c +++ b/magick/quantize.c @@ -786,7 +786,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, /* Start at the root and descend the color cube tree. */ - for (count=1; (x+count) < (ssize_t) image->columns; count++) + for (count=1; (x+count) < image->columns; count++) if (IsSameColor(image,p,p+count) == MagickFalse) break; AssociateAlphaPixel(cube_info,p,&pixel); @@ -875,7 +875,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, /* Start at the root and descend the color cube tree. */ - for (count=1; (x+count) < (ssize_t) image->columns; count++) + for (count=1; (x+count) < image->columns; count++) if (IsSameColor(image,p,p+count) == MagickFalse) break; AssociateAlphaPixel(cube_info,p,&pixel); diff --git a/magick/resize.c b/magick/resize.c index fa2ca435c..b214903de 100644 --- a/magick/resize.c +++ b/magick/resize.c @@ -3004,11 +3004,11 @@ MagickExport Image *ThumbnailImage(const Image *image, (void) CopyMagickString(value,image->magick_filename,MaxTextExtent); if (GetPathAttributes(image->filename,&attributes) != MagickFalse) { - (void) FormatMagickString(value,MaxTextExtent,"%ld",(ssize_t) + (void) FormatMagickString(value,MaxTextExtent,"%ld",(long) attributes.st_mtime); (void) SetImageProperty(thumbnail_image,"Thumb::MTime",value); } - (void) FormatMagickString(value,MaxTextExtent,"%ld",(ssize_t) + (void) FormatMagickString(value,MaxTextExtent,"%ld",(long) attributes.st_mtime); (void) FormatMagickSize(GetBlobSize(image),MagickFalse,value); (void) ConcatenateMagickString(value,"B",MaxTextExtent); @@ -3018,12 +3018,13 @@ MagickExport Image *ThumbnailImage(const Image *image, (void) SetImageProperty(thumbnail_image,"Thumb::Mimetype",value); (void) SetImageProperty(thumbnail_image,"software", GetMagickVersion(&version)); - (void) FormatMagickString(value,MaxTextExtent,"%lu",image->magick_columns); + (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) SetImageProperty(thumbnail_image,"Thumb::Image::height",value); (void) FormatMagickString(value,MaxTextExtent,"%lu", - GetImageListLength(image)); + (unsigned long) GetImageListLength(image)); (void) SetImageProperty(thumbnail_image,"Thumb::Document::Pages",value); return(thumbnail_image); } diff --git a/magick/resource.c b/magick/resource.c index 7def54e77..8c3fb9e8f 100644 --- a/magick/resource.c +++ b/magick/resource.c @@ -678,7 +678,7 @@ MagickExport MagickBooleanType ListMagickResourceInfo(FILE *file, (void) FormatMagickSize(resource_info.disk_limit,MagickFalse,disk_limit); (void) CopyMagickString(time_limit,"unlimited",MaxTextExtent); if (resource_info.time_limit != MagickResourceInfinity) - (void) FormatMagickString(time_limit,MaxTextExtent,"%lu",(size_t) + (void) FormatMagickString(time_limit,MaxTextExtent,"%lu",(unsigned long) resource_info.time_limit); (void) fprintf(file,"File Area Memory Map" " Disk Thread Time\n"); @@ -686,7 +686,7 @@ MagickExport MagickBooleanType ListMagickResourceInfo(FILE *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, - disk_limit,(size_t) resource_info.thread_limit,time_limit); + disk_limit,(unsigned long) resource_info.thread_limit,time_limit); (void) fflush(file); UnlockSemaphoreInfo(resource_semaphore); return(MagickTrue); diff --git a/magick/segment.c b/magick/segment.c index 428b823fe..8bc0253ae 100644 --- a/magick/segment.c +++ b/magick/segment.c @@ -452,7 +452,7 @@ static MagickBooleanType Classify(Image *image,short **extrema, (void) fprintf(stdout,"\tWeighting Exponent = %g\n",(double) weighting_exponent); (void) fprintf(stdout,"\tTotal Number of Clusters = %lu\n\n", - number_clusters); + (unsigned long) number_clusters); /* Print the total number of points per cluster. */ diff --git a/magick/shear.c b/magick/shear.c index d8867cf7e..447cf3276 100644 --- a/magick/shear.c +++ b/magick/shear.c @@ -975,7 +975,8 @@ MagickExport Image *DeskewImage(const Image *image,const double threshold, median_image=DestroyImage(median_image); if (image->debug != MagickFalse) (void) LogMagickEvent(TransformEvent,GetMagickModule()," Deskew geometry: " - "%lux%lu%+ld%+ld",geometry.width,geometry.height,geometry.x,geometry.y); + "%lux%lu%+ld%+ld",(unsigned long) geometry.width,(unsigned long) + geometry.height,(long) geometry.x,(long) geometry.y); crop_image=CropImage(deskew_image,&geometry,exception); deskew_image=DestroyImage(deskew_image); return(crop_image); diff --git a/magick/string.c b/magick/string.c index 95974b9f5..b58bb0f69 100644 --- a/magick/string.c +++ b/magick/string.c @@ -1189,7 +1189,7 @@ MagickExport ssize_t FormatMagickTime(const time_t time,const size_t length, count=FormatMagickString(timestamp,length, "%04d-%02d-%02dT%02d:%02d:%02d%+03ld:00",local_time.tm_year+1900, local_time.tm_mon+1,local_time.tm_mday,local_time.tm_hour, - local_time.tm_min,local_time.tm_sec,(ssize_t) timezone); + local_time.tm_min,local_time.tm_sec,(long) timezone); return(count); } @@ -1568,10 +1568,10 @@ MagickExport void PrintStringInfo(FILE *file,const char *id, p=(char *) string_info->datum; for (i=0; i < string_info->length; i+=0x14) { - (void) fprintf(file,"0x%08lx: ",(size_t) (0x14*i)); + (void) fprintf(file,"0x%08lx: ",(unsigned long) (0x14*i)); for (j=1; j <= MagickMin(string_info->length-i,0x14); j++) { - (void) fprintf(file,"%02lx",(size_t) (*(p+j)) & 0xff); + (void) fprintf(file,"%02lx",(unsigned long) (*(p+j)) & 0xff); if ((j % 0x04) == 0) (void) fputc(' ',file); } @@ -2206,7 +2206,8 @@ MagickExport char **StringToList(const char *text) sizeof(*textlist)); if (textlist[i] == (char *) NULL) ThrowFatalException(ResourceLimitFatalError,"UnableToConvertText"); - (void) FormatMagickString(textlist[i],MaxTextExtent,"0x%08lx: ",0x14*i); + (void) FormatMagickString(textlist[i],MaxTextExtent,"0x%08lx: ", + (long) (0x14*i)); q=textlist[i]+strlen(textlist[i]); for (j=1; j <= (ssize_t) MagickMin(strlen(p),0x14); j++) { diff --git a/magick/threshold.c b/magick/threshold.c index 8c4b8ec06..934499c92 100644 --- a/magick/threshold.c +++ b/magick/threshold.c @@ -1028,7 +1028,7 @@ MagickExport ThresholdMap *GetThresholdMapFile(const char *xml, if ( map->levels[i] < 0 || map->levels[i] > map->divisor ) { (void) ThrowMagickException(exception,GetMagickModule(),OptionError, "XmlInvalidContent", " %ld out of range, map \"%s\"", - map->levels[i], map_id); + (long) map->levels[i],map_id); thresholds = DestroyXMLTree(thresholds); map = DestroyThresholdMap(map); return(map); diff --git a/magick/type.c b/magick/type.c index 8d4846349..c779c8475 100644 --- a/magick/type.c +++ b/magick/type.c @@ -866,7 +866,8 @@ MagickExport MagickBooleanType ListTypeInfo(FILE *file,ExceptionInfo *exception) glyphs="unknown"; if (type_info[i]->glyphs != (char *) NULL) glyphs=type_info[i]->glyphs; - (void) FormatMagickString(weight,MaxTextExtent,"%lu",type_info[i]->weight); + (void) FormatMagickString(weight,MaxTextExtent,"%lu", + (unsigned long) type_info[i]->weight); (void) fprintf(file," Font: %s\n",name); (void) fprintf(file," family: %s\n",family); (void) fprintf(file," style: %s\n",style); diff --git a/magick/utility.c b/magick/utility.c index dfed149c5..80338c538 100644 --- a/magick/utility.c +++ b/magick/utility.c @@ -941,12 +941,12 @@ MagickExport MagickBooleanType GetExecutionPath(char *path,const size_t extent) count; (void) FormatMagickString(link_path,MaxTextExtent,"/proc/%ld/exe", - (ssize_t) getpid()); + (long) getpid()); count=readlink(link_path,execution_path,PATH_MAX); if (count == -1) { (void) FormatMagickString(link_path,MaxTextExtent,"/proc/%ld/file", - (ssize_t) getpid()); + (long) getpid()); count=readlink(link_path,execution_path,PATH_MAX); } if ((count > 0) && (count <= (ssize_t) PATH_MAX)) -- 2.50.1