From: cristy Date: Sat, 5 Jan 2013 17:51:12 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4493 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=efe601ce9ea5ad34ad0e8ad6e61d9be9b148b2a3;p=imagemagick --- diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c index 7552fc4d2..e0f781db9 100644 --- a/MagickCore/accelerate.c +++ b/MagickCore/accelerate.c @@ -323,7 +323,7 @@ static void ConvolveNotify(const char *message,const void *data,size_t length, (void) length; exception=(ExceptionInfo *) user_context; (void) ThrowMagickException(exception,GetMagickModule(),DelegateWarning, - "DelegateFailed","'%s'",message); + "DelegateFailed","`%s'",message); } static MagickBooleanType BindConvolveParameters(ConvolveInfo *convolve_info, @@ -504,7 +504,7 @@ static ConvolveInfo *GetConvolveInfo(const Image *image,const char *name, if (convolve_info == (ConvolveInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return((ConvolveInfo *) NULL); } (void) ResetMagickMemory(convolve_info,0,sizeof(*convolve_info)); @@ -553,7 +553,7 @@ static ConvolveInfo *GetConvolveInfo(const Image *image,const char *name, if (convolve_info->devices == (cl_device_id *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); convolve_info=DestroyConvolveInfo(convolve_info); return((ConvolveInfo *) NULL); } @@ -711,7 +711,7 @@ MagickExport MagickBooleanType AccelerateConvolveImage(const Image *image, { convolve_info=DestroyConvolveInfo(convolve_info); (void) ThrowMagickException(exception,GetMagickModule(),CacheError, - "UnableToReadPixelCache","'%s'",image->filename); + "UnableToReadPixelCache","`%s'",image->filename); return(MagickFalse); } convolve_pixels=GetPixelCachePixels(convolve_image,&length,exception); @@ -719,7 +719,7 @@ MagickExport MagickBooleanType AccelerateConvolveImage(const Image *image, { convolve_info=DestroyConvolveInfo(convolve_info); (void) ThrowMagickException(exception,GetMagickModule(),CacheError, - "UnableToReadPixelCache","'%s'",image->filename); + "UnableToReadPixelCache","`%s'",image->filename); return(MagickFalse); } filter=(float *) AcquireQuantumMemory(kernel->width,kernel->height* @@ -729,7 +729,7 @@ MagickExport MagickBooleanType AccelerateConvolveImage(const Image *image, DestroyConvolveBuffers(convolve_info); convolve_info=DestroyConvolveInfo(convolve_info); (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(MagickFalse); } for (i=0; i < (ssize_t) (kernel->width*kernel->height); i++) diff --git a/MagickCore/animate.c b/MagickCore/animate.c index 1504eacdb..0874e4097 100644 --- a/MagickCore/animate.c +++ b/MagickCore/animate.c @@ -305,7 +305,7 @@ MagickExport MagickBooleanType AnimateImages(const ImageInfo *image_info, if (display == (Display *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),XServerError, - "UnableToOpenXServer","'%s'",XDisplayName(image_info->server_name)); + "UnableToOpenXServer","`%s'",XDisplayName(image_info->server_name)); return(MagickFalse); } if (exception->severity != UndefinedException) diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c index cd5722f08..85199d14c 100644 --- a/MagickCore/annotate.c +++ b/MagickCore/annotate.c @@ -889,7 +889,7 @@ static MagickBooleanType RenderType(Image *image,const DrawInfo *draw_info, type_info=GetTypeInfo(draw_info->font,exception); if (type_info == (const TypeInfo *) NULL) (void) ThrowMagickException(exception,GetMagickModule(),TypeWarning, - "UnableToReadFont","'%s'",draw_info->font); + "UnableToReadFont","`%s'",draw_info->font); } if ((type_info == (const TypeInfo *) NULL) && (draw_info->family != (const char *) NULL)) @@ -898,7 +898,7 @@ static MagickBooleanType RenderType(Image *image,const DrawInfo *draw_info, draw_info->stretch,draw_info->weight,exception); if (type_info == (const TypeInfo *) NULL) (void) ThrowMagickException(exception,GetMagickModule(),TypeWarning, - "UnableToReadFont","'%s'",draw_info->family); + "UnableToReadFont","`%s'",draw_info->family); } if (type_info == (const TypeInfo *) NULL) type_info=GetTypeInfoByFamily("Arial",draw_info->style, @@ -1147,7 +1147,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info, { (void) FT_Done_FreeType(library); (void) ThrowMagickException(exception,GetMagickModule(),TypeError, - "UnableToReadFont","'%s'",draw_info->font); + "UnableToReadFont","`%s'",draw_info->font); return(RenderPostscript(image,draw_info,offset,metrics,exception)); } if ((draw_info->metrics != (char *) NULL) && diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index 486503428..b8ffd008d 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -234,7 +234,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image, image_view=DestroyCacheView(image_view); if ((bounds.width == 0) || (bounds.height == 0)) (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning, - "GeometryDoesNotContainImage","'%s'",image->filename); + "GeometryDoesNotContainImage","`%s'",image->filename); else { bounds.width-=(bounds.x-1); diff --git a/MagickCore/blob.c b/MagickCore/blob.c index b93c11372..1c0df7df2 100644 --- a/MagickCore/blob.c +++ b/MagickCore/blob.c @@ -347,7 +347,7 @@ MagickExport Image *BlobToImage(const ImageInfo *image_info,const void *blob, if ((blob == (const void *) NULL) || (length == 0)) { (void) ThrowMagickException(exception,GetMagickModule(),BlobError, - "ZeroLengthBlobNotPermitted","'%s'",image_info->filename); + "ZeroLengthBlobNotPermitted","`%s'",image_info->filename); return((Image *) NULL); } blob_info=CloneImageInfo(image_info); @@ -360,7 +360,7 @@ MagickExport Image *BlobToImage(const ImageInfo *image_info,const void *blob, { blob_info=DestroyImageInfo(blob_info); (void) ThrowMagickException(exception,GetMagickModule(), - MissingDelegateError,"NoDecodeDelegateForThisImageFormat","'%s'", + MissingDelegateError,"NoDecodeDelegateForThisImageFormat","`%s'", image_info->filename); return((Image *) NULL); } @@ -1001,7 +1001,7 @@ MagickExport unsigned char *FileToBlob(const char *filename,const size_t extent, if (blob == (unsigned char *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",filename); return((unsigned char *) NULL); } if (file == -1) @@ -1023,7 +1023,7 @@ MagickExport unsigned char *FileToBlob(const char *filename,const size_t extent, { file=close(file); (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",filename); return((unsigned char *) NULL); } map=MapBlob(file,ReadMode,0,*length); @@ -1520,7 +1520,7 @@ MagickExport unsigned char *ImageToBlob(const ImageInfo *image_info, if (magick_info == (const MagickInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - MissingDelegateError,"NoDecodeDelegateForThisImageFormat","'%s'", + MissingDelegateError,"NoDecodeDelegateForThisImageFormat","`%s'", image->filename); return(blob); } @@ -1535,7 +1535,7 @@ MagickExport unsigned char *ImageToBlob(const ImageInfo *image_info, sizeof(unsigned char)); if (blob_info->blob == (void *) NULL) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); else { (void) CloseBlob(image); @@ -1668,7 +1668,7 @@ MagickExport MagickBooleanType ImageToFile(Image *image,char *filename, { file=close(file)-1; (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationError","'%s'",filename); + ResourceLimitError,"MemoryAllocationError","`%s'",filename); return(MagickFalse); } length=0; @@ -1775,7 +1775,7 @@ MagickExport unsigned char *ImagesToBlob(const ImageInfo *image_info, if (magick_info == (const MagickInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - MissingDelegateError,"NoDecodeDelegateForThisImageFormat","'%s'", + MissingDelegateError,"NoDecodeDelegateForThisImageFormat","`%s'", images->filename); return(blob); } @@ -1790,7 +1790,7 @@ MagickExport unsigned char *ImagesToBlob(const ImageInfo *image_info, sizeof(unsigned char)); if (blob_info->blob == (void *) NULL) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",images->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",images->filename); else { images->blob->exempt=MagickTrue; @@ -2390,7 +2390,7 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info, { errno=EPERM; (void) ThrowMagickException(exception,GetMagickModule(),PolicyError, - "NotAuthorized","'%s'",filename); + "NotAuthorized","`%s'",filename); return(MagickFalse); } if ((LocaleCompare(filename,"-") == 0) || @@ -2515,8 +2515,8 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info, image->blob->type=FileStream; #if defined(MAGICKCORE_HAVE_SETVBUF) - (void) setvbuf(image->blob->file_info.file,(char *) NULL, - (int) _IOFBF,16384); + (void) setvbuf(image->blob->file_info.file,(char *) NULL,(int) + _IOFBF,16384); #endif (void) ResetMagickMemory(magick,0,sizeof(magick)); count=fread(magick,1,sizeof(magick),image->blob->file_info.file); @@ -2620,8 +2620,8 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info, { image->blob->type=FileStream; #if defined(MAGICKCORE_HAVE_SETVBUF) - (void) setvbuf(image->blob->file_info.file,(char *) NULL,(int) _IOFBF, - 16384); + (void) setvbuf(image->blob->file_info.file,(char *) NULL,(int) + _IOFBF,16384); #endif } } @@ -2702,7 +2702,7 @@ MagickExport Image *PingBlob(const ImageInfo *image_info,const void *blob, if ((blob == (const void *) NULL) || (length == 0)) { (void) ThrowMagickException(exception,GetMagickModule(),BlobError, - "UnrecognizedImageFormat","'%s'",image_info->magick); + "UnrecognizedImageFormat","`%s'",image_info->magick); return((Image *) NULL); } ping_info=CloneImageInfo(image_info); @@ -2710,7 +2710,7 @@ MagickExport Image *PingBlob(const ImageInfo *image_info,const void *blob, if (ping_info->blob == (const void *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitFatalError,"MemoryAllocationFailed","'%s'",""); + ResourceLimitFatalError,"MemoryAllocationFailed","`%s'",""); return((Image *) NULL); } (void) memcpy(ping_info->blob,blob,length); @@ -3811,7 +3811,7 @@ MagickPrivate MagickBooleanType SetBlobExtent(Image *image, #endif offset=SeekBlob(image,offset,SEEK_SET); if (count != 1) - return(MagickTrue); + return(MagickFalse); image->blob->data=(unsigned char*) MapBlob(fileno( image->blob->file_info.file),WriteMode,0,(size_t) extent); image->blob->extent=(size_t) extent; diff --git a/MagickCore/cache.c b/MagickCore/cache.c index 31b7ac9ac..afe01aed4 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -617,7 +617,7 @@ static MagickBooleanType DiskToDiskPixelCacheClone(CacheInfo *clone_info, if (blob == (unsigned char *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", cache_info->filename); return(MagickFalse); } @@ -785,7 +785,7 @@ static MagickBooleanType PixelCacheCloneUnoptimized(CacheInfo *clone_info, if (blob == (unsigned char *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", cache_info->filename); return(MagickFalse); } @@ -3090,7 +3090,7 @@ MagickPrivate const Quantum *GetVirtualPixelsFromNexus(const Image *image, if (virtual_nexus != (NexusInfo **) NULL) virtual_nexus=DestroyPixelCacheNexus(virtual_nexus,1); (void) ThrowMagickException(exception,GetMagickModule(),CacheError, - "UnableToGetCacheNexus","'%s'",image->filename); + "UnableToGetCacheNexus","`%s'",image->filename); return((const Quantum *) NULL); } (void) ResetMagickMemory(virtual_pixel,0,cache_info->number_channels* @@ -3120,7 +3120,7 @@ MagickPrivate const Quantum *GetVirtualPixelsFromNexus(const Image *image, { virtual_nexus=DestroyPixelCacheNexus(virtual_nexus,1); (void) ThrowMagickException(exception,GetMagickModule(), - CacheError,"UnableToGetCacheNexus","'%s'",image->filename); + CacheError,"UnableToGetCacheNexus","`%s'",image->filename); return((const Quantum *) NULL); } (void) ResetMagickMemory(virtual_metacontent,0, @@ -3833,7 +3833,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode, if (status == MagickFalse) { (void) ThrowMagickException(exception,GetMagickModule(),CacheError, - "CacheResourcesExhausted","'%s'",image->filename); + "CacheResourcesExhausted","`%s'",image->filename); return(MagickFalse); } if ((source_info.storage_class != UndefinedClass) && (mode != ReadMode)) @@ -4128,14 +4128,14 @@ MagickPrivate Quantum *QueueAuthenticPixelCacheNexus(Image *image, if ((cache_info->columns == 0) && (cache_info->rows == 0)) { (void) ThrowMagickException(exception,GetMagickModule(),CacheError, - "NoPixelsDefinedInCache","'%s'",image->filename); + "NoPixelsDefinedInCache","`%s'",image->filename); return((Quantum *) NULL); } if ((x < 0) || (y < 0) || (x >= (ssize_t) cache_info->columns) || (y >= (ssize_t) cache_info->rows)) { (void) ThrowMagickException(exception,GetMagickModule(),CacheError, - "PixelsAreNotAuthentic","'%s'",image->filename); + "PixelsAreNotAuthentic","`%s'",image->filename); return((Quantum *) NULL); } offset=(MagickOffsetType) y*cache_info->columns+x; @@ -4751,7 +4751,7 @@ static inline MagickBooleanType AcquireCacheNexusPixels( if (nexus_info->cache == (Quantum *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", cache_info->filename); return(MagickFalse); } diff --git a/MagickCore/channel.c b/MagickCore/channel.c index cac63b018..29ebf59db 100644 --- a/MagickCore/channel.c +++ b/MagickCore/channel.c @@ -303,7 +303,7 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression, if (i < 0) { (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnrecognizedChannelType","'%s'",token); + "UnrecognizedChannelType","`%s'",token); destination_image=DestroyImageList(destination_image); return(destination_image); } @@ -342,7 +342,7 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression, if (i < 0) { (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnrecognizedChannelType","'%s'",token); + "UnrecognizedChannelType","`%s'",token); destination_image=DestroyImageList(destination_image); return(destination_image); } diff --git a/MagickCore/coder.c b/MagickCore/coder.c index c25ba2c69..2ca485848 100644 --- a/MagickCore/coder.c +++ b/MagickCore/coder.c @@ -754,7 +754,7 @@ static MagickBooleanType LoadCoderList(const char *xml,const char *filename, { if (depth > 200) (void) ThrowMagickException(exception,GetMagickModule(), - ConfigureError,"IncludeNodeNestedTooDeeply","'%s'",token); + ConfigureError,"IncludeNodeNestedTooDeeply","`%s'",token); else { char @@ -802,7 +802,7 @@ static MagickBooleanType LoadCoderList(const char *xml,const char *filename, coder_info->magick),coder_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", coder_info->magick); coder_info=(CoderInfo *) NULL; } @@ -920,7 +920,7 @@ static MagickBooleanType LoadCoderLists(const char *filename, if (coder_info == (CoderInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",coder_info->name); + ResourceLimitError,"MemoryAllocationFailed","`%s'",coder_info->name); continue; } (void) ResetMagickMemory(coder_info,0,sizeof(*coder_info)); @@ -933,7 +933,7 @@ static MagickBooleanType LoadCoderLists(const char *filename, coder_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",coder_info->name); + ResourceLimitError,"MemoryAllocationFailed","`%s'",coder_info->name); } /* Load external coder map. diff --git a/MagickCore/color.c b/MagickCore/color.c index 432ad6d7a..f5e02e704 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -948,7 +948,7 @@ MagickExport const ColorInfo *GetColorCompliance(const char *name, } if (p == (ColorInfo *) NULL) (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning, - "UnrecognizedColor","'%s'",name); + "UnrecognizedColor","`%s'",name); else (void) InsertValueInLinkedList(color_list,0, RemoveElementByValueFromLinkedList(color_list,p)); @@ -1899,7 +1899,7 @@ static MagickBooleanType LoadColorList(const char *xml,const char *filename, { if (depth > 200) (void) ThrowMagickException(exception,GetMagickModule(), - ConfigureError,"IncludeElementNestedTooDeeply","'%s'",token); + ConfigureError,"IncludeElementNestedTooDeeply","`%s'",token); else { char @@ -1946,7 +1946,7 @@ static MagickBooleanType LoadColorList(const char *xml,const char *filename, status=AppendValueToLinkedList(color_list,color_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", color_info->name); color_info=(ColorInfo *) NULL; } @@ -2079,7 +2079,7 @@ static MagickBooleanType LoadColorLists(const char *filename, if (color_info == (ColorInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",color_info->name); + ResourceLimitError,"MemoryAllocationFailed","`%s'",color_info->name); continue; } (void) ResetMagickMemory(color_info,0,sizeof(*color_info)); @@ -2096,7 +2096,7 @@ static MagickBooleanType LoadColorLists(const char *filename, status=AppendValueToLinkedList(color_list,color_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",color_info->name); + ResourceLimitError,"MemoryAllocationFailed","`%s'",color_info->name); } /* Load external color map. @@ -2231,7 +2231,7 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, if ((n % 4) != 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionWarning,"UnrecognizedColor","'%s'",name); + OptionWarning,"UnrecognizedColor","`%s'",name); return(MagickFalse); } do @@ -2322,7 +2322,7 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, if (type < 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionWarning,"UnrecognizedColor","'%s'",name); + OptionWarning,"UnrecognizedColor","`%s'",name); return(MagickFalse); } color->colorspace=(ColorspaceType) type; diff --git a/MagickCore/colormap-private.h b/MagickCore/colormap-private.h index c97e37001..165183401 100644 --- a/MagickCore/colormap-private.h +++ b/MagickCore/colormap-private.h @@ -32,7 +32,7 @@ static inline Quantum ConstrainColormapIndex(Image *image,const size_t index, if (index < image->colors) return((Quantum) index); (void) ThrowMagickException(exception,GetMagickModule(),CorruptImageError, - "InvalidColormapIndex","'%s'",image->filename); + "InvalidColormapIndex","`%s'",image->filename); return((Quantum) 0); } diff --git a/MagickCore/compare.c b/MagickCore/compare.c index a94923cde..f255bfeeb 100644 --- a/MagickCore/compare.c +++ b/MagickCore/compare.c @@ -1247,7 +1247,7 @@ MagickExport double *GetImageDistortions(Image *image, (reconstruct_image->rows != image->rows)) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ImageSizeDiffers","'%s'",image->filename); + "ImageSizeDiffers","`%s'",image->filename); return((double *) NULL); } /* diff --git a/MagickCore/configure.c b/MagickCore/configure.c index cc8ec7e68..67d46c85d 100644 --- a/MagickCore/configure.c +++ b/MagickCore/configure.c @@ -617,7 +617,7 @@ MagickExport LinkedListInfo *GetConfigureOptions(const char *filename, #endif if (GetNumberOfElementsInLinkedList(options) == 0) (void) ThrowMagickException(exception,GetMagickModule(),ConfigureWarning, - "UnableToOpenConfigureFile","'%s'",filename); + "UnableToOpenConfigureFile","`%s'",filename); ResetLinkedListIterator(options); return(options); } @@ -1104,7 +1104,7 @@ static MagickBooleanType LoadConfigureList(const char *xml,const char *filename, { if (depth > 200) (void) ThrowMagickException(exception,GetMagickModule(), - ConfigureError,"IncludeElementNestedTooDeeply","'%s'",token); + ConfigureError,"IncludeElementNestedTooDeeply","`%s'",token); else { char @@ -1152,7 +1152,7 @@ static MagickBooleanType LoadConfigureList(const char *xml,const char *filename, status=AppendValueToLinkedList(configure_list,configure_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", configure_info->name); configure_info=(ConfigureInfo *) NULL; } @@ -1273,7 +1273,7 @@ static MagickBooleanType LoadConfigureLists(const char *filename, if (configure_info == (ConfigureInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", configure_info->name); continue; } @@ -1286,7 +1286,7 @@ static MagickBooleanType LoadConfigureLists(const char *filename, status=AppendValueToLinkedList(configure_list,configure_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", configure_info->name); } /* diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c index d62467f9b..b580e78a9 100644 --- a/MagickCore/constitute.c +++ b/MagickCore/constitute.c @@ -463,7 +463,7 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, { errno=EPERM; (void) ThrowMagickException(exception,GetMagickModule(),PolicyError, - "NotAuthorized","'%s'",read_info->filename); + "NotAuthorized","`%s'",read_info->filename); read_info=DestroyImageInfo(read_info); return((Image *) NULL); } @@ -554,7 +554,7 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, if (delegate_info == (const DelegateInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - MissingDelegateError,"NoDecodeDelegateForThisImageFormat","'%s'", + MissingDelegateError,"NoDecodeDelegateForThisImageFormat","`%s'", read_info->filename); if (read_info->temporary != MagickFalse) (void) RelinquishUniqueFileResource(read_info->filename); @@ -588,7 +588,7 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, { if (IsPathAccessible(read_info->filename) != MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - MissingDelegateError,"NoDecodeDelegateForThisImageFormat","'%s'", + MissingDelegateError,"NoDecodeDelegateForThisImageFormat","`%s'", read_info->filename); else ThrowFileException(exception,FileOpenError,"UnableToOpenFile", @@ -630,7 +630,7 @@ MagickExport Image *ReadImage(const ImageInfo *image_info, clones=CloneImages(image,read_info->scenes,exception); if (clones == (Image *) NULL) (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "SubimageSpecificationReturnsNoImages","'%s'",read_info->filename); + "SubimageSpecificationReturnsNoImages","`%s'",read_info->filename); else { image=DestroyImageList(image); @@ -1209,11 +1209,11 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, (GetImageEncoder(magick_info) == (EncodeImageHandler *) NULL)) (void) ThrowMagickException(exception,GetMagickModule(), MissingDelegateError,"NoEncodeDelegateForThisImageFormat", - "'%s'",image->filename); + "`%s'",image->filename); else (void) ThrowMagickException(exception,GetMagickModule(), MissingDelegateWarning,"NoEncodeDelegateForThisImageFormat", - "'%s'",image->filename); + "`%s'",image->filename); } if ((magick_info != (const MagickInfo *) NULL) && (GetImageEncoder(magick_info) != (EncodeImageHandler *) NULL)) diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c index f2d9c61a5..7a3d57f50 100644 --- a/MagickCore/delegate.c +++ b/MagickCore/delegate.c @@ -277,21 +277,21 @@ MagickExport char *GetDelegateCommand(const ImageInfo *image_info,Image *image, if (delegate_info == (const DelegateInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),DelegateError, - "NoTagFound","'%s'",decode ? decode : encode); + "NoTagFound","`%s'",decode ? decode : encode); return((char *) NULL); } commands=StringToList(delegate_info->commands); if (commands == (char **) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", decode ? decode : encode); return((char *) NULL); } command=InterpretImageProperties(image_info,image,commands[0],exception); if (command == (char *) NULL) (void) ThrowMagickException(exception,GetMagickModule(),ResourceLimitError, - "MemoryAllocationFailed","'%s'",commands[0]); + "MemoryAllocationFailed","`%s'",commands[0]); /* Relinquish resources. */ @@ -869,14 +869,14 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, { errno=EPERM; (void) ThrowMagickException(exception,GetMagickModule(),PolicyError, - "NotAuthorized","'%s'",decode); + "NotAuthorized","`%s'",decode); return(MagickFalse); } if( IfMagickFalse(IsRightsAuthorized(DelegatePolicyDomain,rights,encode)) ) { errno=EPERM; (void) ThrowMagickException(exception,GetMagickModule(),PolicyError, - "NotAuthorized","'%s'",encode); + "NotAuthorized","`%s'",encode); return(MagickFalse); } temporary=IsMagickTrue(*image->filename == '\0'); @@ -893,7 +893,7 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, if( IfMagickTrue(temporary) ) (void) RelinquishUniqueFileResource(image->filename); (void) ThrowMagickException(exception,GetMagickModule(),DelegateError, - "NoTagFound","'%s'",decode ? decode : encode); + "NoTagFound","`%s'",decode ? decode : encode); return(MagickFalse); } if (*image_info->filename == '\0') @@ -947,7 +947,7 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, if( IfMagickTrue(temporary) ) (void) RelinquishUniqueFileResource(image->filename); (void) ThrowMagickException(exception,GetMagickModule(), - DelegateError,"DelegateFailed","'%s'",decode ? decode : encode); + DelegateError,"DelegateFailed","`%s'",decode ? decode : encode); return(MagickFalse); } LocaleUpper(magick); @@ -978,7 +978,7 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, (void) RelinquishUniqueFileResource(image->filename); clone_info=DestroyImageInfo(clone_info); (void) ThrowMagickException(exception,GetMagickModule(), - DelegateError,"DelegateFailed","'%s'",decode ? decode : encode); + DelegateError,"DelegateFailed","`%s'",decode ? decode : encode); return(MagickFalse); } if( IfMagickTrue(clone_info->adjoin) ) @@ -997,7 +997,7 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, if( IfMagickTrue(temporary) ) (void) RelinquishUniqueFileResource(image->filename); (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", decode ? decode : encode); return(MagickFalse); } @@ -1070,7 +1070,7 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, if( IfMagickTrue(status) ) { (void) ThrowMagickException(exception,GetMagickModule(),DelegateError, - "DelegateFailed","'%s'",commands[i]); + "DelegateFailed","`%s'",commands[i]); break; } commands[i]=DestroyString(commands[i]); @@ -1292,7 +1292,7 @@ static MagickBooleanType LoadDelegateList(const char *xml,const char *filename, { if (depth > 200) (void) ThrowMagickException(exception,GetMagickModule(), - ConfigureError,"IncludeElementNestedTooDeeply","'%s'",token); + ConfigureError,"IncludeElementNestedTooDeeply","`%s'",token); else { char @@ -1339,7 +1339,7 @@ static MagickBooleanType LoadDelegateList(const char *xml,const char *filename, status=AppendValueToLinkedList(delegate_list,delegate_info); if( IfMagickFalse(status) ) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", delegate_info->commands); delegate_info=(DelegateInfo *) NULL; } diff --git a/MagickCore/display.c b/MagickCore/display.c index bc26228bf..b84510fc9 100644 --- a/MagickCore/display.c +++ b/MagickCore/display.c @@ -1681,7 +1681,7 @@ MagickExport MagickBooleanType DisplayImages(const ImageInfo *image_info, if (display == (Display *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),XServerError, - "UnableToOpenXServer","'%s'",XDisplayName(image_info->server_name)); + "UnableToOpenXServer","`%s'",XDisplayName(image_info->server_name)); return(MagickFalse); } if (exception->severity != UndefinedException) @@ -1759,7 +1759,7 @@ MagickExport MagickBooleanType RemoteDisplayCommand(const ImageInfo *image_info, if (display == (Display *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),XServerError, - "UnableToOpenXServer","'%s'",XDisplayName(image_info->server_name)); + "UnableToOpenXServer","`%s'",XDisplayName(image_info->server_name)); return(MagickFalse); } (void) XSetErrorHandler(XError); @@ -5513,7 +5513,7 @@ static MagickBooleanType XDrawEditImage(Display *display, if (coordinate_info == (XPoint *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'","..."); + ResourceLimitError,"MemoryAllocationFailed","`%s'","..."); return(MagickFalse); } /* @@ -6138,7 +6138,7 @@ static MagickBooleanType XDrawEditImage(Display *display, max_coordinates,sizeof(*coordinate_info)); if (coordinate_info == (XPoint *) NULL) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'","..."); + ResourceLimitError,"MemoryAllocationFailed","`%s'","..."); break; } case Expose: @@ -6165,7 +6165,7 @@ static MagickBooleanType XDrawEditImage(Display *display, max_coordinates,sizeof(*coordinate_info)); if (coordinate_info == (XPoint *) NULL) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'","..."); + ResourceLimitError,"MemoryAllocationFailed","`%s'","..."); break; } default: diff --git a/MagickCore/draw.c b/MagickCore/draw.c index 03a4fba84..5c4e855a4 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -2252,7 +2252,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, if (n <= 0) { (void) ThrowMagickException(exception,GetMagickModule(), - DrawError,"UnbalancedGraphicContextPushPop","'%s'",token); + DrawError,"UnbalancedGraphicContextPushPop","`%s'",token); n=0; break; } @@ -2417,7 +2417,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, if (graphic_context == (DrawInfo **) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", image->filename); break; } @@ -2560,7 +2560,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, if (graphic_context[n]->dash_pattern == (double *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", image->filename); break; } @@ -2792,7 +2792,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, if (primitive_info == (PrimitiveInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); break; } } @@ -2839,7 +2839,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, { if (primitive_info[j].coordinates > 107) (void) ThrowMagickException(exception,GetMagickModule(),DrawError, - "TooManyBezierCoordinates","'%s'",token); + "TooManyBezierCoordinates","`%s'",token); length=BezierQuantum*primitive_info[j].coordinates; break; } @@ -2898,7 +2898,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, if (primitive_info == (PrimitiveInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", image->filename); break; } diff --git a/MagickCore/exception-private.h b/MagickCore/exception-private.h index cb6b7eb0b..3a2b608e4 100644 --- a/MagickCore/exception-private.h +++ b/MagickCore/exception-private.h @@ -30,7 +30,7 @@ extern "C" { { \ if (image != (Image *) NULL) \ (void) ThrowMagickException(exception,GetMagickModule(),severity, \ - tag == (const char *) NULL ? "unknown" : tag,"'%s'",context); \ + tag == (const char *) NULL ? "unknown" : tag,"`%s'",context); \ return(MagickFalse); \ } #define ThrowFatalException(severity,tag) \ @@ -44,7 +44,7 @@ extern "C" { GetExceptionInfo(&exception); \ message=GetExceptionMessage(errno); \ (void) ThrowMagickException(&exception,GetMagickModule(),severity, \ - tag == (const char *) NULL ? "unknown" : tag,"'%s'",message); \ + tag == (const char *) NULL ? "unknown" : tag,"`%s'",message); \ message=DestroyString(message); \ CatchException(&exception); \ (void) DestroyExceptionInfo(&exception); \ @@ -64,13 +64,13 @@ extern "C" { #define ThrowImageException(severity,tag) \ { \ (void) ThrowMagickException(exception,GetMagickModule(),severity, \ - tag == (const char *) NULL ? "unknown" : tag,"'%s'",image->filename); \ + tag == (const char *) NULL ? "unknown" : tag,"`%s'",image->filename); \ return((Image *) NULL); \ } #define ThrowReaderException(severity,tag) \ { \ (void) ThrowMagickException(exception,GetMagickModule(),severity, \ - tag == (const char *) NULL ? "unknown" : tag,"'%s'",image_info->filename); \ + tag == (const char *) NULL ? "unknown" : tag,"`%s'",image_info->filename); \ if ((image) != (Image *) NULL) \ { \ (void) CloseBlob(image); \ @@ -81,7 +81,7 @@ extern "C" { #define ThrowWriterException(severity,tag) \ { \ (void) ThrowMagickException(exception,GetMagickModule(),severity, \ - tag == (const char *) NULL ? "unknown" : tag,"'%s'",image->filename); \ + tag == (const char *) NULL ? "unknown" : tag,"`%s'",image->filename); \ if (image_info->adjoin != MagickFalse) \ while (image->previous != (Image *) NULL) \ image=image->previous; \ diff --git a/MagickCore/feature.c b/MagickCore/feature.c index e87cb5d46..2b339aa75 100644 --- a/MagickCore/feature.c +++ b/MagickCore/feature.c @@ -209,7 +209,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, channel_features=(ChannelFeatures *) RelinquishMagickMemory( channel_features); (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(channel_features); } for (i=0; i <= (ssize_t) MaxMap; i++) @@ -340,7 +340,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, channel_features=(ChannelFeatures *) RelinquishMagickMemory( channel_features); (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(channel_features); } (void) ResetMagickMemory(&correlation,0,sizeof(correlation)); @@ -389,7 +389,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, channel_features=(ChannelFeatures *) RelinquishMagickMemory( channel_features); (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(channel_features); } /* @@ -522,7 +522,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, channel_features=(ChannelFeatures *) RelinquishMagickMemory( channel_features); (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(channel_features); } /* diff --git a/MagickCore/fourier.c b/MagickCore/fourier.c index 6d068cd02..41442ce71 100644 --- a/MagickCore/fourier.c +++ b/MagickCore/fourier.c @@ -250,7 +250,7 @@ static MagickBooleanType ForwardFourier(const FourierInfo *fourier_info, if (phase_image == (Image *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "TwoOrMoreImagesRequired","'%s'",image->filename); + "TwoOrMoreImagesRequired","`%s'",image->filename); return(MagickFalse); } /* @@ -267,7 +267,7 @@ static MagickBooleanType ForwardFourier(const FourierInfo *fourier_info, if (phase_source == (double *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); magnitude_source=(double *) RelinquishMagickMemory(magnitude_source); return(MagickFalse); } @@ -433,7 +433,7 @@ static MagickBooleanType ForwardFourierTransform(FourierInfo *fourier_info, if (source == (double *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(MagickFalse); } ResetMagickMemory(source,0,fourier_info->height*fourier_info->width* @@ -487,7 +487,7 @@ static MagickBooleanType ForwardFourierTransform(FourierInfo *fourier_info, if (fourier == (fftw_complex *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); source=(double *) RelinquishMagickMemory(source); return(MagickFalse); } @@ -575,7 +575,7 @@ static MagickBooleanType ForwardFourierTransformChannel(const Image *image, if (magnitude == (double *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(MagickFalse); } phase=(double *) AcquireQuantumMemory((size_t) fourier_info.height, @@ -583,7 +583,7 @@ static MagickBooleanType ForwardFourierTransformChannel(const Image *image, if (phase == (double *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); magnitude=(double *) RelinquishMagickMemory(magnitude); return(MagickFalse); } @@ -592,7 +592,7 @@ static MagickBooleanType ForwardFourierTransformChannel(const Image *image, if (fourier == (fftw_complex *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); phase=(double *) RelinquishMagickMemory(phase); magnitude=(double *) RelinquishMagickMemory(magnitude); return(MagickFalse); @@ -840,7 +840,7 @@ static MagickBooleanType InverseFourier(FourierInfo *fourier_info, if (magnitude_source == (double *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", magnitude_image->filename); return(MagickFalse); } @@ -849,7 +849,7 @@ static MagickBooleanType InverseFourier(FourierInfo *fourier_info, if (phase_source == (double *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", magnitude_image->filename); magnitude_source=(double *) RelinquishMagickMemory(magnitude_source); return(MagickFalse); @@ -958,7 +958,7 @@ static MagickBooleanType InverseFourier(FourierInfo *fourier_info, if (magnitude == (double *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", magnitude_image->filename); magnitude_source=(double *) RelinquishMagickMemory(magnitude_source); phase_source=(double *) RelinquishMagickMemory(phase_source); @@ -972,7 +972,7 @@ static MagickBooleanType InverseFourier(FourierInfo *fourier_info, if (phase == (double *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", magnitude_image->filename); phase_source=(double *) RelinquishMagickMemory(phase_source); return(MagickFalse); @@ -1042,7 +1042,7 @@ static MagickBooleanType InverseFourierTransform(FourierInfo *fourier_info, if (source == (double *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(MagickFalse); } #if defined(MAGICKCORE_OPENMP_SUPPORT) @@ -1146,7 +1146,7 @@ static MagickBooleanType InverseFourierTransformChannel( if (magnitude == (double *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", magnitude_image->filename); return(MagickFalse); } @@ -1155,7 +1155,7 @@ static MagickBooleanType InverseFourierTransformChannel( if (phase == (double *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", magnitude_image->filename); magnitude=(double *) RelinquishMagickMemory(magnitude); return(MagickFalse); @@ -1165,7 +1165,7 @@ static MagickBooleanType InverseFourierTransformChannel( if (fourier == (fftw_complex *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", magnitude_image->filename); phase=(double *) RelinquishMagickMemory(phase); magnitude=(double *) RelinquishMagickMemory(magnitude); @@ -1198,7 +1198,7 @@ MagickExport Image *InverseFourierTransformImage(const Image *magnitude_image, if (phase_image == (Image *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "TwoOrMoreImagesRequired","'%s'",magnitude_image->filename); + "TwoOrMoreImagesRequired","`%s'",magnitude_image->filename); return((Image *) NULL); } #if !defined(MAGICKCORE_FFTW_DELEGATE) diff --git a/MagickCore/fx.c b/MagickCore/fx.c index b27450fc9..653319e56 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -1282,7 +1282,7 @@ static inline const char *FxSubexpression(const char *expression, } if (*subexpression == '\0') (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnbalancedParenthesis","'%s'",expression); + "UnbalancedParenthesis","`%s'",expression); return(subexpression); } @@ -1430,7 +1430,7 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, if (image == (Image *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "NoSuchImage","'%s'",expression); + "NoSuchImage","`%s'",expression); return(0.0); } GetPixelInfo(image,&pixel); @@ -1497,7 +1497,7 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, if (image->colorspace != CMYKColorspace) { (void) ThrowMagickException(exception,GetMagickModule(), - ImageError,"ColorSeparatedImageRequired","'%s'", + ImageError,"ColorSeparatedImageRequired","`%s'", image->filename); return(0.0); } @@ -1523,7 +1523,7 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, break; } (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnableToParseExpression","'%s'",p); + "UnableToParseExpression","`%s'",p); return(0.0); } switch (*symbol) @@ -1655,7 +1655,7 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, if (image->colorspace != CMYKColorspace) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"ColorSeparatedImageRequired","'%s'", + OptionError,"ColorSeparatedImageRequired","`%s'", image->filename); return(0.0); } @@ -1845,7 +1845,7 @@ static double FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, if (value != (const char *) NULL) return((double) StringToDouble(value,(char **) NULL)); (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnableToParseExpression","'%s'",symbol); + "UnableToParseExpression","`%s'",symbol); return(0.0); } @@ -2128,7 +2128,7 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, if (*expression == '\0') { (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "MissingExpression","'%s'",expression); + "MissingExpression","`%s'",expression); return(0.0); } *subexpression='\0'; @@ -2171,7 +2171,7 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, { if (exception->severity == UndefinedException) (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"DivideByZero","'%s'",expression); + OptionError,"DivideByZero","`%s'",expression); return(0.0); } return(alpha/(*beta)); @@ -2183,7 +2183,7 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, if (*beta == 0.0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"DivideByZero","'%s'",expression); + OptionError,"DivideByZero","`%s'",expression); return(0.0); } return(fmod((double) alpha,(double) *beta)); @@ -2275,7 +2275,7 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, if (q == (char *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"UnableToParseExpression","'%s'",subexpression); + OptionError,"UnableToParseExpression","`%s'",subexpression); return(0.0); } if (fabs((double) alpha) >= MagickEpsilon) @@ -2295,7 +2295,7 @@ static double FxEvaluateSubexpression(FxInfo *fx_info, if (*q != '\0') { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"UnableToParseExpression","'%s'",subexpression); + OptionError,"UnableToParseExpression","`%s'",subexpression); return(0.0); } ClearMagickException(exception); diff --git a/MagickCore/geometry.c b/MagickCore/geometry.c index 4b765d6de..b7e27d66c 100644 --- a/MagickCore/geometry.c +++ b/MagickCore/geometry.c @@ -1151,7 +1151,7 @@ MagickExport MagickStatusType ParseGravityGeometry(const Image *image, if (flags == NoValue) { (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "InvalidGeometry","'%s'",geometry); + "InvalidGeometry","`%s'",geometry); return(flags); } if ((flags & PercentValue) != 0) @@ -1438,7 +1438,7 @@ MagickExport MagickStatusType ParsePageGeometry(const Image *image, if (flags == NoValue) { (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "InvalidGeometry","'%s'",geometry); + "InvalidGeometry","`%s'",geometry); return(flags); } if ((flags & PercentValue) != 0) @@ -1503,7 +1503,7 @@ MagickExport MagickStatusType ParseRegionGeometry(const Image *image, ®ion_info->width,®ion_info->height); if (flags == NoValue) (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "InvalidGeometry","'%s'",geometry); + "InvalidGeometry","`%s'",geometry); return(flags); } diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c index f244bcccd..0eee2cacf 100644 --- a/MagickCore/histogram.c +++ b/MagickCore/histogram.c @@ -219,7 +219,7 @@ static CubeInfo *ClassifyImageColors(const Image *image, if (cube_info == (CubeInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(cube_info); } GetPixelInfo(image,&pixel); @@ -247,7 +247,7 @@ static CubeInfo *ClassifyImageColors(const Image *image, if (node_info->child[id] == (NodeInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", image->filename); return(0); } @@ -274,7 +274,7 @@ static CubeInfo *ClassifyImageColors(const Image *image, if (node_info->list == (PixelInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", image->filename); return(0); } @@ -537,7 +537,7 @@ MagickExport PixelInfo *GetImageHistogram(const Image *image, sizeof(*histogram)); if (histogram == (PixelInfo *) NULL) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); else { PixelInfo @@ -681,7 +681,7 @@ MagickExport MagickBooleanType IsHistogramImage(const Image *image, if (cube_info == (CubeInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(MagickFalse); } GetPixelInfo(image,&pixel); @@ -709,7 +709,7 @@ MagickExport MagickBooleanType IsHistogramImage(const Image *image, if (node_info->child[id] == (NodeInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", image->filename); break; } @@ -741,7 +741,7 @@ MagickExport MagickBooleanType IsHistogramImage(const Image *image, if (node_info->list == (PixelInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", image->filename); break; } @@ -841,7 +841,7 @@ MagickExport MagickBooleanType IsPaletteImage(const Image *image, if (cube_info == (CubeInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(MagickFalse); } GetPixelInfo(image,&pixel); @@ -869,7 +869,7 @@ MagickExport MagickBooleanType IsPaletteImage(const Image *image, if (node_info->child[id] == (NodeInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", image->filename); break; } @@ -901,7 +901,7 @@ MagickExport MagickBooleanType IsPaletteImage(const Image *image, if (node_info->list == (PixelInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", image->filename); break; } diff --git a/MagickCore/image.c b/MagickCore/image.c index a97195334..f32f938a1 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -3652,7 +3652,7 @@ MagickExport MagickBooleanType SyncImage(Image *image,ExceptionInfo *exception) image_view=DestroyCacheView(image_view); if ((image->ping == MagickFalse) && (range_exception != MagickFalse)) (void) ThrowMagickException(exception,GetMagickModule(),CorruptImageError, - "InvalidColormapIndex","'%s'",image->filename); + "InvalidColormapIndex","`%s'",image->filename); return(status); } diff --git a/MagickCore/layer.c b/MagickCore/layer.c index f1372970d..1699005c6 100644 --- a/MagickCore/layer.c +++ b/MagickCore/layer.c @@ -1681,7 +1681,7 @@ MagickExport void RemoveZeroDelayLayers(Image **images, if ( i->delay != 0L ) break; if ( i == (Image *) NULL ) { (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning, - "ZeroTimeAnimation","'%s'",GetFirstImageInList(*images)->filename); + "ZeroTimeAnimation","`%s'",GetFirstImageInList(*images)->filename); return; } i=GetFirstImageInList(*images); diff --git a/MagickCore/list.c b/MagickCore/list.c index 47dc0fc89..0324df19f 100644 --- a/MagickCore/list.c +++ b/MagickCore/list.c @@ -371,7 +371,7 @@ MagickExport void DeleteImages(Image **images,const char *scenes, if (delete_list == (MagickBooleanType *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",(*images)->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",(*images)->filename); return; } image=(*images); @@ -842,7 +842,7 @@ MagickExport Image **ImageListToArray(const Image *images, if (group == (Image **) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",images->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",images->filename); return((Image **) NULL); } images=GetFirstImageInList(images); diff --git a/MagickCore/locale.c b/MagickCore/locale.c index 045a8b412..6d50cfbd9 100644 --- a/MagickCore/locale.c +++ b/MagickCore/locale.c @@ -1168,7 +1168,7 @@ static MagickBooleanType LoadLocaleList(const char *xml,const char *filename, { if (depth > 200) (void) ThrowMagickException(exception,GetMagickModule(), - ConfigureError,"IncludeElementNestedTooDeeply","'%s'",token); + ConfigureError,"IncludeElementNestedTooDeeply","`%s'",token); else { char @@ -1256,7 +1256,7 @@ static MagickBooleanType LoadLocaleList(const char *xml,const char *filename, status=AddValueToSplayTree(locale_list,locale_info->tag,locale_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", locale_info->tag); (void) ConcatenateMagickString(tag,message,MaxTextExtent); (void) ConcatenateMagickString(tag,"\n",MaxTextExtent); diff --git a/MagickCore/log.c b/MagickCore/log.c index b48a77a1a..cf100acd9 100644 --- a/MagickCore/log.c +++ b/MagickCore/log.c @@ -1354,7 +1354,7 @@ static MagickBooleanType LoadLogList(const char *xml,const char *filename, { if (depth > 200) (void) ThrowMagickException(exception,GetMagickModule(), - ConfigureError,"IncludeElementNestedTooDeeply","'%s'",token); + ConfigureError,"IncludeElementNestedTooDeeply","`%s'",token); else { char @@ -1402,7 +1402,7 @@ static MagickBooleanType LoadLogList(const char *xml,const char *filename, status=AppendValueToLinkedList(log_list,log_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",filename); log_info=(LogInfo *) NULL; } GetMagickToken(q,(const char **) NULL,token); @@ -1563,7 +1563,7 @@ static MagickBooleanType LoadLogLists(const char *filename, if (log_info == (LogInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",log_info->name); + ResourceLimitError,"MemoryAllocationFailed","`%s'",log_info->name); continue; } (void) ResetMagickMemory(log_info,0,sizeof(*log_info)); @@ -1578,7 +1578,7 @@ static MagickBooleanType LoadLogLists(const char *filename, status=AppendValueToLinkedList(log_list,log_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",log_info->name); + ResourceLimitError,"MemoryAllocationFailed","`%s'",log_info->name); } /* Load external log map. diff --git a/MagickCore/magic.c b/MagickCore/magic.c index d6d450b30..584ee3ffb 100644 --- a/MagickCore/magic.c +++ b/MagickCore/magic.c @@ -741,7 +741,7 @@ static MagickBooleanType LoadMagicList(const char *xml,const char *filename, { if (depth > 200) (void) ThrowMagickException(exception,GetMagickModule(), - ConfigureError,"IncludeElementNestedTooDeeply","'%s'",token); + ConfigureError,"IncludeElementNestedTooDeeply","`%s'",token); else { char @@ -788,7 +788,7 @@ static MagickBooleanType LoadMagicList(const char *xml,const char *filename, status=AppendValueToLinkedList(magic_list,magic_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", magic_info->name); magic_info=(MagicInfo *) NULL; } @@ -968,7 +968,7 @@ static MagickBooleanType LoadMagicLists(const char *filename, if (magic_info == (MagicInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",magic_info->name); + ResourceLimitError,"MemoryAllocationFailed","`%s'",magic_info->name); continue; } (void) ResetMagickMemory(magic_info,0,sizeof(*magic_info)); @@ -983,7 +983,7 @@ static MagickBooleanType LoadMagicLists(const char *filename, status=AppendValueToLinkedList(magic_list,magic_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",magic_info->name); + ResourceLimitError,"MemoryAllocationFailed","`%s'",magic_info->name); } /* Load external magic map. diff --git a/MagickCore/mime.c b/MagickCore/mime.c index 0afef26f9..57d20ed8b 100644 --- a/MagickCore/mime.c +++ b/MagickCore/mime.c @@ -784,7 +784,7 @@ static MagickBooleanType LoadMimeList(const char *xml,const char *filename, { if (depth > 200) (void) ThrowMagickException(exception,GetMagickModule(), - ConfigureError,"IncludeElementNestedTooDeeply","'%s'",filename); + ConfigureError,"IncludeElementNestedTooDeeply","`%s'",filename); else { char @@ -920,7 +920,7 @@ static MagickBooleanType LoadMimeList(const char *xml,const char *filename, status=AppendValueToLinkedList(mime_list,mime_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",filename); mime=GetNextXMLTreeTag(mime); } mime_map=DestroyXMLTree(mime_map); diff --git a/MagickCore/module.c b/MagickCore/module.c index bf3ce2eee..4dfd0b6f8 100644 --- a/MagickCore/module.c +++ b/MagickCore/module.c @@ -510,7 +510,7 @@ MagickExport char **GetModuleList(const char *pattern, if (modules == (char **) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),ConfigureError, - "MemoryAllocationFailed","'%s'",pattern); + "MemoryAllocationFailed","`%s'",pattern); return((char **) NULL); } qsort((void *) modules,(size_t) i,sizeof(*modules),ModuleCompare); @@ -676,7 +676,7 @@ static MagickBooleanType GetMagickModulePath(const char *filename, if (key_value == (unsigned char *) NULL) { ThrowMagickException(exception,GetMagickModule(),ConfigureError, - "RegistryKeyLookupFailed","'%s'",registery_key); + "RegistryKeyLookupFailed","`%s'",registery_key); return(MagickFalse); } (void) FormatLocaleString(path,MaxTextExtent,"%s%s%s",(char *) key_value, @@ -977,7 +977,7 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag, { errno=EPERM; (void) ThrowMagickException(exception,GetMagickModule(),PolicyError, - "NotAuthorized","'%s'",tag); + "NotAuthorized","`%s'",tag); return(MagickFalse); } TagToFilterModuleName(tag,name); @@ -1423,7 +1423,7 @@ static const ModuleInfo *RegisterModule(const ModuleInfo *module_info, status=AddValueToSplayTree(module_list,module_info->tag,module_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(),ResourceLimitError, - "MemoryAllocationFailed","'%s'",module_info->tag); + "MemoryAllocationFailed","`%s'",module_info->tag); return(module_info); } @@ -1634,7 +1634,7 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag, { errno=EPERM; (void) ThrowMagickException(exception,GetMagickModule(),PolicyError, - "NotAuthorized","'%s'",tag); + "NotAuthorized","`%s'",tag); return(MagickFalse); } #if defined(MAGICKCORE_BUILD_MODULES) @@ -1655,7 +1655,7 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag, image_filter=(ImageFilterHandler *) analyzeImage; if (image_filter == (ImageFilterHandler *) NULL) (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, - "UnableToLoadModule","'%s'",tag); + "UnableToLoadModule","`%s'",tag); else { size_t diff --git a/MagickCore/nt-feature.c b/MagickCore/nt-feature.c index fc76494b9..3208301dd 100644 --- a/MagickCore/nt-feature.c +++ b/MagickCore/nt-feature.c @@ -543,7 +543,7 @@ MagickExport MagickBooleanType NTLoadTypeLists(SplayTreeInfo *type_list, type_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",type_info->name); + ResourceLimitError,"MemoryAllocationFailed","`%s'",type_info->name); } } RegCloseKey ( reg_key ); @@ -618,7 +618,7 @@ MagickExport void *ImageToHBITMAP(Image *image,ExceptionInfo *exception) message=GetExceptionMessage(errno); (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",message); + ResourceLimitError,"MemoryAllocationFailed","`%s'",message); message=DestroyString(message); return(NULL); } @@ -651,7 +651,7 @@ MagickExport void *ImageToHBITMAP(Image *image,ExceptionInfo *exception) message=GetExceptionMessage(errno); (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",message); + ResourceLimitError,"MemoryAllocationFailed","`%s'",message); message=DestroyString(message); } GlobalUnlock((HGLOBAL) bitmap_bitsH); diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index 46c35c790..21d69a142 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -1883,7 +1883,7 @@ MagickExport MagickBooleanType ExportImagePixels(Image *image, if (quantum_map == (QuantumType *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(MagickFalse); } for (i=0; i < (ssize_t) length; i++) @@ -1910,7 +1910,7 @@ MagickExport MagickBooleanType ExportImagePixels(Image *image, break; quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","'%s'",map); + "ColorSeparatedImageRequired","`%s'",map); return(MagickFalse); } case 'g': @@ -1933,7 +1933,7 @@ MagickExport MagickBooleanType ExportImagePixels(Image *image, break; quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","'%s'",map); + "ColorSeparatedImageRequired","`%s'",map); return(MagickFalse); } case 'M': @@ -1944,7 +1944,7 @@ MagickExport MagickBooleanType ExportImagePixels(Image *image, break; quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","'%s'",map); + "ColorSeparatedImageRequired","`%s'",map); return(MagickFalse); } case 'o': @@ -1973,14 +1973,14 @@ MagickExport MagickBooleanType ExportImagePixels(Image *image, break; quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","'%s'",map); + "ColorSeparatedImageRequired","`%s'",map); return(MagickFalse); } default: { quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnrecognizedPixelMap","'%s'",map); + "UnrecognizedPixelMap","`%s'",map); return(MagickFalse); } } @@ -2030,7 +2030,7 @@ MagickExport MagickBooleanType ExportImagePixels(Image *image, { quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnrecognizedPixelMap","'%s'",map); + "UnrecognizedPixelMap","`%s'",map); break; } } @@ -3869,7 +3869,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,const ssize_t x, { quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnrecognizedPixelMap","'%s'",map); + "UnrecognizedPixelMap","`%s'",map); return(MagickFalse); } } @@ -3924,7 +3924,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,const ssize_t x, { quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnrecognizedPixelMap","'%s'",map); + "UnrecognizedPixelMap","`%s'",map); break; } } diff --git a/MagickCore/policy.c b/MagickCore/policy.c index 3b3849643..af985d489 100644 --- a/MagickCore/policy.c +++ b/MagickCore/policy.c @@ -720,7 +720,7 @@ static MagickBooleanType LoadPolicyList(const char *xml,const char *filename, { if (depth > 200) (void) ThrowMagickException(exception,GetMagickModule(), - ConfigureError,"IncludeElementNestedTooDeeply","'%s'",token); + ConfigureError,"IncludeElementNestedTooDeeply","`%s'",token); else { char @@ -767,7 +767,7 @@ static MagickBooleanType LoadPolicyList(const char *xml,const char *filename, status=AppendValueToLinkedList(policy_list,policy_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", policy_info->name); policy_info=(PolicyInfo *) NULL; } @@ -916,7 +916,7 @@ static MagickBooleanType LoadPolicyLists(const char *filename, if (policy_info == (PolicyInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",policy_info->name); + ResourceLimitError,"MemoryAllocationFailed","`%s'",policy_info->name); continue; } (void) ResetMagickMemory(policy_info,0,sizeof(*policy_info)); @@ -931,7 +931,7 @@ static MagickBooleanType LoadPolicyLists(const char *filename, status=AppendValueToLinkedList(policy_list,policy_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",policy_info->name); + ResourceLimitError,"MemoryAllocationFailed","`%s'",policy_info->name); } /* Load external policy map. diff --git a/MagickCore/prepress.c b/MagickCore/prepress.c index 0a9ef8372..6b038c554 100644 --- a/MagickCore/prepress.c +++ b/MagickCore/prepress.c @@ -105,7 +105,7 @@ MagickExport double GetImageTotalInkDensity(Image *image, if (image->colorspace != CMYKColorspace) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","'%s'",image->filename); + "ColorSeparatedImageRequired","`%s'",image->filename); return(0.0); } status=MagickTrue; diff --git a/MagickCore/profile.c b/MagickCore/profile.c index 349a10f0c..839d57503 100644 --- a/MagickCore/profile.c +++ b/MagickCore/profile.c @@ -457,14 +457,14 @@ static void CMSExceptionHandler(cmsContext context,cmsUInt32Number severity, if (image == (Image *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),ImageWarning, - "UnableToTransformColorspace","'%s'","unknown context"); + "UnableToTransformColorspace","`%s'","unknown context"); return; } if (image->debug != MagickFalse) (void) LogMagickEvent(TransformEvent,GetMagickModule(),"lcms: #%u, %s", severity,message != (char *) NULL ? message : "no message"); (void) ThrowMagickException(exception,GetMagickModule(),ImageWarning, - "UnableToTransformColorspace","'%s'",image->filename); + "UnableToTransformColorspace","`%s'",image->filename); } #else static int CMSExceptionHandler(int severity,const char *message) diff --git a/MagickCore/property.c b/MagickCore/property.c index da5820f12..215aa4400 100644 --- a/MagickCore/property.c +++ b/MagickCore/property.c @@ -3446,7 +3446,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, if (strlen(property) <= 1) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } @@ -3462,7 +3462,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, if (LocaleNCompare("8bim:",property,5) == 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } break; @@ -3486,7 +3486,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, if (LocaleCompare("channels",property) == 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } if (LocaleCompare("colorspace",property) == 0) @@ -3547,7 +3547,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, if (LocaleCompare("copyright",property) == 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } break; /* add to properties splay tree */ @@ -3582,7 +3582,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, if (LocaleCompare("delay_units",property) == 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } if (LocaleCompare("density",property) == 0) @@ -3623,7 +3623,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, if (LocaleNCompare("exif:",property,5) == 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } break; /* add to properties splay tree */ @@ -3634,7 +3634,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, if (LocaleNCompare("fx:",property,3) == 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } break; /* add to properties splay tree */ @@ -3667,7 +3667,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, if (LocaleCompare("height",property) == 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } break; /* add to properties splay tree */ @@ -3704,7 +3704,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, if (LocaleNCompare("iptc:",property,5) == 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } #endif @@ -3715,7 +3715,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, if (LocaleCompare("kurtosis",property) == 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } break; /* add to properties splay tree */ @@ -3738,7 +3738,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, (LocaleCompare("min",property) == 0) ) { (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "SetReadOnlyProperty","'%s'",property); + "SetReadOnlyProperty","`%s'",property); return(MagickFalse); } break; /* add to properties splay tree */ @@ -3747,7 +3747,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, if (LocaleCompare("opaque",property) == 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } break; /* add to properties splay tree */ @@ -3769,7 +3769,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, if (LocaleNCompare("pixel:",property,6) == 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } #endif @@ -3817,7 +3817,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, (LocaleCompare("standard-deviation",property) == 0) ) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } break; /* add to properties splay tree */ @@ -3858,7 +3858,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, if (LocaleCompare("version",property) == 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } break; /* add to properties splay tree */ @@ -3869,7 +3869,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, if (LocaleCompare("width",property) == 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } break; /* add to properties splay tree */ @@ -3882,7 +3882,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image, if (LocaleNCompare("xmp:",property,4) == 0) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"SetReadOnlyProperty","'%s'",property); + OptionError,"SetReadOnlyProperty","`%s'",property); return(MagickFalse); } break; /* add to properties splay tree */ diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c index 4c7842a82..e292b4441 100644 --- a/MagickCore/quantize.c +++ b/MagickCore/quantize.c @@ -868,7 +868,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, node_info->child[id]=GetNodeInfo(cube_info,id,level,node_info); if (node_info->child[id] == (NodeInfo *) NULL) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", image->filename); if (level == MaxTreeDepth) cube_info->colors++; @@ -2883,7 +2883,7 @@ MagickExport MagickBooleanType QuantizeImages(const QuantizeInfo *quantize_info, if (cube_info == (CubeInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",images->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",images->filename); return(MagickFalse); } number_images=GetImageListLength(images); diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c index 4a2092265..e51e974ab 100644 --- a/MagickCore/quantum-export.c +++ b/MagickCore/quantum-export.c @@ -889,7 +889,7 @@ static void ExportBlackQuantum(const Image *image,QuantumInfo *quantum_info, if (image->colorspace != CMYKColorspace) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","'%s'",image->filename); + "ColorSeparatedImageRequired","`%s'",image->filename); return; } switch (quantum_info->depth) @@ -1211,7 +1211,7 @@ static void ExportCMYKQuantum(const Image *image,QuantumInfo *quantum_info, if (image->colorspace != CMYKColorspace) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","'%s'",image->filename); + "ColorSeparatedImageRequired","`%s'",image->filename); return; } switch (quantum_info->depth) @@ -1356,7 +1356,7 @@ static void ExportCMYKAQuantum(const Image *image,QuantumInfo *quantum_info, if (image->colorspace != CMYKColorspace) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","'%s'",image->filename); + "ColorSeparatedImageRequired","`%s'",image->filename); return; } switch (quantum_info->depth) @@ -2090,7 +2090,7 @@ static void ExportIndexQuantum(const Image *image,QuantumInfo *quantum_info, if (image->storage_class != PseudoClass) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColormappedImageRequired","'%s'",image->filename); + "ColormappedImageRequired","`%s'",image->filename); return; } switch (quantum_info->depth) @@ -2257,7 +2257,7 @@ static void ExportIndexAlphaQuantum(const Image *image, if (image->storage_class != PseudoClass) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColormappedImageRequired","'%s'",image->filename); + "ColormappedImageRequired","`%s'",image->filename); return; } switch (quantum_info->depth) diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c index c2ef92b63..6c993b3cb 100644 --- a/MagickCore/quantum-import.c +++ b/MagickCore/quantum-import.c @@ -922,7 +922,7 @@ static void ImportBlackQuantum(const Image *image,QuantumInfo *quantum_info, if (image->colorspace != CMYKColorspace) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","'%s'",image->filename); + "ColorSeparatedImageRequired","`%s'",image->filename); return; } switch (quantum_info->depth) @@ -1250,7 +1250,7 @@ static void ImportCMYKQuantum(const Image *image,QuantumInfo *quantum_info, if (image->colorspace != CMYKColorspace) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","'%s'",image->filename); + "ColorSeparatedImageRequired","`%s'",image->filename); return; } switch (quantum_info->depth) @@ -1415,7 +1415,7 @@ static void ImportCMYKAQuantum(const Image *image,QuantumInfo *quantum_info, if (image->colorspace != CMYKColorspace) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","'%s'",image->filename); + "ColorSeparatedImageRequired","`%s'",image->filename); return; } switch (quantum_info->depth) @@ -2234,7 +2234,7 @@ static void ImportIndexQuantum(const Image *image,QuantumInfo *quantum_info, if (image->storage_class != PseudoClass) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColormappedImageRequired","'%s'",image->filename); + "ColormappedImageRequired","`%s'",image->filename); return; } range_exception=MagickFalse; @@ -2421,7 +2421,7 @@ static void ImportIndexQuantum(const Image *image,QuantumInfo *quantum_info, } if (range_exception != MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(),CorruptImageError, - "InvalidColormapIndex","'%s'",image->filename); + "InvalidColormapIndex","`%s'",image->filename); } static void ImportIndexAlphaQuantum(const Image *image, @@ -2446,7 +2446,7 @@ static void ImportIndexAlphaQuantum(const Image *image, if (image->storage_class != PseudoClass) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColormappedImageRequired","'%s'",image->filename); + "ColormappedImageRequired","`%s'",image->filename); return; } range_exception=MagickFalse; @@ -2638,7 +2638,7 @@ static void ImportIndexAlphaQuantum(const Image *image, } if (range_exception != MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(),CorruptImageError, - "InvalidColormapIndex","'%s'",image->filename); + "InvalidColormapIndex","`%s'",image->filename); } static void ImportOpacityQuantum(const Image *image,QuantumInfo *quantum_info, diff --git a/MagickCore/registry.c b/MagickCore/registry.c index 6d38eeafd..6152878cd 100644 --- a/MagickCore/registry.c +++ b/MagickCore/registry.c @@ -203,7 +203,7 @@ MagickExport void *GetImageRegistry(const RegistryType type,const char *key, if (registry_info == (void *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),RegistryError, - "UnableToGetRegistryID","'%s'",key); + "UnableToGetRegistryID","`%s'",key); return((void *) NULL); } value=(void *) NULL; diff --git a/MagickCore/resize.c b/MagickCore/resize.c index b05dd9d37..ef48b3ad0 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -2227,7 +2227,7 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter, if (contributions == (ContributionInfo **) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(MagickFalse); } status=MagickTrue; @@ -2440,7 +2440,7 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter, if (contributions == (ContributionInfo **) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(MagickFalse); } status=MagickTrue; diff --git a/MagickCore/segment.c b/MagickCore/segment.c index 2bfd854ae..e2d52187e 100644 --- a/MagickCore/segment.c +++ b/MagickCore/segment.c @@ -1006,7 +1006,7 @@ MagickExport MagickBooleanType GetImageDynamicThreshold(const Image *image, histogram[i]=(ssize_t *) RelinquishMagickMemory(histogram[i]); } (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(MagickFalse); } } @@ -1053,7 +1053,7 @@ MagickExport MagickBooleanType GetImageDynamicThreshold(const Image *image, if (cluster == (Cluster *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", image->filename); return(MagickFalse); } @@ -1077,7 +1077,7 @@ MagickExport MagickBooleanType GetImageDynamicThreshold(const Image *image, if (cluster == (Cluster *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(MagickFalse); } /* diff --git a/MagickCore/shear.c b/MagickCore/shear.c index 4cc40319c..adfe58bf3 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -345,7 +345,7 @@ static RadonInfo *AcquireRadonInfo(const Image *image,const size_t width, if (status == MagickFalse) { (void) ThrowMagickException(exception,GetMagickModule(),CacheError, - "CacheResourcesExhausted","'%s'",image->filename); + "CacheResourcesExhausted","`%s'",image->filename); return(DestroyRadonInfo(radon_info)); } radon_info->type=DiskCache; diff --git a/MagickCore/static.c b/MagickCore/static.c index b5a13ff53..0be6761f6 100644 --- a/MagickCore/static.c +++ b/MagickCore/static.c @@ -97,7 +97,7 @@ MagickExport MagickBooleanType InvokeStaticImageFilter(const char *tag, { errno=EPERM; (void) ThrowMagickException(exception,GetMagickModule(),PolicyError, - "NotAuthorized","'%s'",tag); + "NotAuthorized","`%s'",tag); return(MagickFalse); } #if defined(MAGICKCORE_BUILD_MODULES) @@ -118,7 +118,7 @@ MagickExport MagickBooleanType InvokeStaticImageFilter(const char *tag, image_filter=(ImageFilterHandler *) analyzeImage; if (image_filter == (ImageFilterHandler *) NULL) (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, - "UnableToLoadModule","'%s'",tag); + "UnableToLoadModule","`%s'",tag); else { size_t diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index ee5ad1ade..d3bcc5188 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -475,7 +475,7 @@ MagickExport Image *EvaluateImages(const Image *images, { image=DestroyImage(image); (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",images->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",images->filename); return((Image *) NULL); } /* @@ -1812,7 +1812,7 @@ MagickExport Image *PolynomialImage(const Image *images, { image=DestroyImage(image); (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",images->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",images->filename); return((Image *) NULL); } /* diff --git a/MagickCore/stream.c b/MagickCore/stream.c index 41ea5b966..2054e156b 100644 --- a/MagickCore/stream.c +++ b/MagickCore/stream.c @@ -700,7 +700,7 @@ static inline MagickBooleanType AcquireStreamPixels(CacheInfo *cache_info, if (cache_info->pixels == (Quantum *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", cache_info->filename); return(MagickFalse); } @@ -737,7 +737,7 @@ static const Quantum *GetVirtualPixelStream(const Image *image, (columns == 0) || (rows == 0)) { (void) ThrowMagickException(exception,GetMagickModule(),StreamError, - "ImageDoesNotContainTheStreamGeometry","'%s'",image->filename); + "ImageDoesNotContainTheStreamGeometry","`%s'",image->filename); return((Quantum *) NULL); } cache_info=(CacheInfo *) image->cache; @@ -880,14 +880,14 @@ static Quantum *QueueAuthenticPixelsStream(Image *image,const ssize_t x, (columns == 0) || (rows == 0)) { (void) ThrowMagickException(exception,GetMagickModule(),StreamError, - "ImageDoesNotContainTheStreamGeometry","'%s'",image->filename); + "ImageDoesNotContainTheStreamGeometry","`%s'",image->filename); return((Quantum *) NULL); } stream_handler=GetBlobStreamHandler(image); if (stream_handler == (StreamHandler) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),StreamError, - "NoStreamHandlerIsDefined","'%s'",image->filename); + "NoStreamHandlerIsDefined","`%s'",image->filename); return((Quantum *) NULL); } cache_info=(CacheInfo *) image->cache; @@ -1326,7 +1326,7 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info, if (quantum_map == (QuantumType *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename); + ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(MagickFalse); } for (i=0; i < (ssize_t) length; i++) @@ -1353,7 +1353,7 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info, break; quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","'%s'",stream_info->map); + "ColorSeparatedImageRequired","`%s'",stream_info->map); return(MagickFalse); } case 'g': @@ -1376,7 +1376,7 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info, break; quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","'%s'",stream_info->map); + "ColorSeparatedImageRequired","`%s'",stream_info->map); return(MagickFalse); } case 'M': @@ -1387,7 +1387,7 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info, break; quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","'%s'",stream_info->map); + "ColorSeparatedImageRequired","`%s'",stream_info->map); return(MagickFalse); } case 'o': @@ -1416,14 +1416,14 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info, break; quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","'%s'",stream_info->map); + "ColorSeparatedImageRequired","`%s'",stream_info->map); return(MagickFalse); } default: { quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnrecognizedPixelMap","'%s'",stream_info->map); + "UnrecognizedPixelMap","`%s'",stream_info->map); return(MagickFalse); } } @@ -2643,7 +2643,7 @@ static MagickBooleanType StreamImagePixels(const StreamInfo *stream_info, { quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnrecognizedPixelMap","'%s'",stream_info->map); + "UnrecognizedPixelMap","`%s'",stream_info->map); break; } } @@ -2699,7 +2699,7 @@ static MagickBooleanType SyncAuthenticPixelsStream(Image *image, if (stream_handler == (StreamHandler) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),StreamError, - "NoStreamHandlerIsDefined","'%s'",image->filename); + "NoStreamHandlerIsDefined","`%s'",image->filename); return(MagickFalse); } length=stream_handler(image,cache_info->pixels,(size_t) cache_info->columns); diff --git a/MagickCore/transform.c b/MagickCore/transform.c index bf0208460..7a9c08d5a 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -604,7 +604,7 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry, Crop is not within virtual canvas, return 1 pixel transparent image. */ (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning, - "GeometryDoesNotContainImage","'%s'",image->filename); + "GeometryDoesNotContainImage","`%s'",image->filename); crop_image=CloneImage(image,1,1,MagickTrue,exception); if (crop_image == (Image *) NULL) return((Image *) NULL); @@ -654,7 +654,7 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry, if ((page.width == 0) || (page.height == 0)) { (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning, - "GeometryDoesNotContainImage","'%s'",image->filename); + "GeometryDoesNotContainImage","`%s'",image->filename); return((Image *) NULL); } /* diff --git a/MagickCore/type.c b/MagickCore/type.c index 264308924..13be5f71e 100644 --- a/MagickCore/type.c +++ b/MagickCore/type.c @@ -398,7 +398,7 @@ MagickExport const TypeInfo *GetTypeInfoByFamily(const char *family, if (type_info != (const TypeInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),TypeError, - "FontSubstitutionRequired","'%s'",type_info->family); + "FontSubstitutionRequired","`%s'",type_info->family); return(type_info); } if (family != (const char *) NULL) @@ -1040,7 +1040,7 @@ static MagickBooleanType LoadTypeList(const char *xml,const char *filename, { if (depth > 200) (void) ThrowMagickException(exception,GetMagickModule(), - ConfigureError,"IncludeNodeNestedTooDeeply","'%s'",token); + ConfigureError,"IncludeNodeNestedTooDeeply","`%s'",token); else { char @@ -1092,7 +1092,7 @@ static MagickBooleanType LoadTypeList(const char *xml,const char *filename, status=AddValueToSplayTree(type_list,type_info->name,type_info); if (status == MagickFalse) (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",type_info->name); + ResourceLimitError,"MemoryAllocationFailed","`%s'",type_info->name); type_info=(TypeInfo *) NULL; } GetMagickToken(q,(const char **) NULL,token); diff --git a/MagickCore/utility.c b/MagickCore/utility.c index 0dba16248..527d3a369 100644 --- a/MagickCore/utility.c +++ b/MagickCore/utility.c @@ -1816,7 +1816,7 @@ MagickExport int SystemCommand(const MagickBooleanType asynchronous, { errno=EPERM; (void) ThrowMagickException(exception,GetMagickModule(),PolicyError, - "NotAuthorized","'%s'",arguments[1]); + "NotAuthorized","`%s'",arguments[1]); for (i=0; i < (ssize_t) number_arguments; i++) arguments[i]=DestroyString(arguments[i]); arguments=(char **) RelinquishMagickMemory(arguments); diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c index 58cfc109a..23f1a9443 100644 --- a/MagickCore/xml-tree.c +++ b/MagickCore/xml-tree.c @@ -1809,7 +1809,7 @@ MagickExport XMLTreeInfo *NewXMLTree(const char *xml,ExceptionInfo *exception) if (attributes == (char **) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'",""); + ResourceLimitError,"MemoryAllocationFailed","`%s'",""); utf8=DestroyString(utf8); return(&root->root); } diff --git a/MagickWand/animate.c b/MagickWand/animate.c index 750fd71a6..4512abbe0 100644 --- a/MagickWand/animate.c +++ b/MagickWand/animate.c @@ -245,7 +245,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info, } #define ThrowAnimateException(asperity,tag,option) \ { \ - (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"'%s'", \ + (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"`%s'", \ option); \ DestroyAnimate(); \ return(MagickFalse); \ diff --git a/MagickWand/compare.c b/MagickWand/compare.c index 2c5813296..0531d4bc0 100644 --- a/MagickWand/compare.c +++ b/MagickWand/compare.c @@ -188,7 +188,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info, { \ if (exception->severity < (asperity)) \ (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag, \ - "'%s'",option); \ + "`%s'",option); \ DestroyCompare(); \ return(MagickFalse); \ } diff --git a/MagickWand/composite.c b/MagickWand/composite.c index 01560cb55..52dc05e71 100644 --- a/MagickWand/composite.c +++ b/MagickWand/composite.c @@ -393,7 +393,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info, } #define ThrowCompositeException(asperity,tag,option) \ { \ - (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"'%s'", \ + (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"`%s'", \ option == (char *) NULL ? GetExceptionMessage(errno) : option); \ DestroyComposite(); \ return(MagickFalse); \ diff --git a/MagickWand/conjure.c b/MagickWand/conjure.c index 79b8e0ec8..ae3a56bb2 100644 --- a/MagickWand/conjure.c +++ b/MagickWand/conjure.c @@ -139,7 +139,7 @@ WandExport MagickBooleanType ConjureImageCommand(ImageInfo *image_info, } #define ThrowConjureException(asperity,tag,option) \ { \ - (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"'%s'", \ + (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"`%s'", \ option); \ DestroyConjure(); \ return(MagickFalse); \ diff --git a/MagickWand/convert.c b/MagickWand/convert.c index 509ac8dba..57b1fe849 100644 --- a/MagickWand/convert.c +++ b/MagickWand/convert.c @@ -491,7 +491,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info, } #define ThrowConvertException(asperity,tag,option) \ { \ - (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"'%s'", \ + (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"`%s'", \ option); \ DestroyConvert(); \ return(MagickFalse); \ diff --git a/MagickWand/display.c b/MagickWand/display.c index d4afd10ed..4f722aea0 100644 --- a/MagickWand/display.c +++ b/MagickWand/display.c @@ -283,7 +283,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info, } #define ThrowDisplayException(asperity,tag,option) \ { \ - (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"'%s'", \ + (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"`%s'", \ option); \ DestroyDisplay(); \ return(MagickFalse); \ diff --git a/MagickWand/drawing-wand.c b/MagickWand/drawing-wand.c index 220bc1f22..d78a46d5c 100644 --- a/MagickWand/drawing-wand.c +++ b/MagickWand/drawing-wand.c @@ -60,7 +60,7 @@ #define CurrentContext (wand->graphic_context[wand->index]) #define DrawingWandId "DrawingWand" #define ThrowDrawException(severity,tag,reason) (void) ThrowMagickException( \ - wand->exception,GetMagickModule(),severity,tag,"'%s'",reason); + wand->exception,GetMagickModule(),severity,tag,"`%s'",reason); /* Typedef declarations. diff --git a/MagickWand/identify.c b/MagickWand/identify.c index ec7197211..16727ee34 100644 --- a/MagickWand/identify.c +++ b/MagickWand/identify.c @@ -189,7 +189,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info, } #define ThrowIdentifyException(asperity,tag,option) \ { \ - (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"'%s'", \ + (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"`%s'", \ option); \ DestroyIdentify(); \ return(MagickFalse); \ diff --git a/MagickWand/import.c b/MagickWand/import.c index 7f9ddf26e..2a0a1ab7a 100644 --- a/MagickWand/import.c +++ b/MagickWand/import.c @@ -236,7 +236,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info, } #define ThrowImportException(asperity,tag,option) \ { \ - (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"'%s'", \ + (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"`%s'", \ option); \ DestroyImport(); \ return(MagickFalse); \ diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c index e75314913..f3cbf817e 100644 --- a/MagickWand/magick-cli.c +++ b/MagickWand/magick-cli.c @@ -777,7 +777,7 @@ Magick_Command_Cleanup: exception); if (text == (char *) NULL) ThrowMagickException(exception,GetMagickModule(),ResourceLimitError, - "MemoryAllocationFailed","'%s'", GetExceptionMessage(errno)); + "MemoryAllocationFailed","`%s'", GetExceptionMessage(errno)); else { (void) ConcatenateString(&(*metadata),text); text=DestroyString(text); diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c index de5f5af7a..94c0f526a 100644 --- a/MagickWand/magick-image.c +++ b/MagickWand/magick-image.c @@ -58,7 +58,7 @@ #define ThrowWandException(severity,tag,context) \ { \ (void) ThrowMagickException(wand->exception,GetMagickModule(),severity, \ - tag,"'%s'",context); \ + tag,"`%s'",context); \ return(MagickFalse); \ } #define MagickWandId "MagickWand" @@ -149,7 +149,7 @@ WandExport Image *GetImageFromMagickWand(const MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((Image *) NULL); } return(wand->images); @@ -1778,7 +1778,7 @@ WandExport MagickWand *MagickCompareImages(MagickWand *wand, if ((wand->images == (Image *) NULL) || (reference->images == (Image *) NULL)) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((MagickWand *) NULL); } compare_image=CompareImages(wand->images,reference->images,metric,distortion, @@ -3560,7 +3560,7 @@ WandExport MagickWand *MagickGetImage(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((MagickWand *) NULL); } image=CloneImage(wand->images,0,0,MagickTrue,wand->exception); @@ -3638,7 +3638,7 @@ WandExport MagickWand *MagickGetImageMask(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((MagickWand *) NULL); } image=GetImageMask(wand->images,wand->exception); @@ -3726,7 +3726,7 @@ WandExport unsigned char *MagickGetImageBlob(MagickWand *wand,size_t *length) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((unsigned char *) NULL); } return(ImageToBlob(wand->image_info,wand->images,length,wand->exception)); @@ -3775,7 +3775,7 @@ WandExport unsigned char *MagickGetImagesBlob(MagickWand *wand,size_t *length) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((unsigned char *) NULL); } blob=ImagesToBlob(wand->image_info,GetFirstImageInList(wand->images),length, @@ -3911,7 +3911,7 @@ WandExport ChannelFeatures *MagickGetImageFeatures(MagickWand *wand, if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((ChannelFeatures *) NULL); } return(GetImageFeatures(wand->images,distance,wand->exception)); @@ -4089,7 +4089,7 @@ WandExport ChannelStatistics *MagickGetImageStatistics(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((ChannelStatistics *) NULL); } return(GetImageStatistics(wand->images,wand->exception)); @@ -4136,7 +4136,7 @@ WandExport MagickBooleanType MagickGetImageColormapColor(MagickWand *wand, (index >= wand->images->colors)) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "InvalidColormapIndex","'%s'",wand->name); + "InvalidColormapIndex","`%s'",wand->name); return(MagickFalse); } PixelSetPixelColor(color,wand->images->colormap+index); @@ -4174,7 +4174,7 @@ WandExport size_t MagickGetImageColors(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(0); } return(GetNumberColors(wand->images,(FILE *) NULL,wand->exception)); @@ -4211,7 +4211,7 @@ WandExport ColorspaceType MagickGetImageColorspace(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(UndefinedColorspace); } return(wand->images->colorspace); @@ -4249,7 +4249,7 @@ WandExport CompositeOperator MagickGetImageCompose(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(UndefinedCompositeOp); } return(wand->images->compose); @@ -4286,7 +4286,7 @@ WandExport CompressionType MagickGetImageCompression(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(UndefinedCompression); } return(wand->images->compression); @@ -4323,7 +4323,7 @@ WandExport size_t MagickGetImageCompressionQuality(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(0UL); } return(wand->images->quality); @@ -4426,7 +4426,7 @@ WandExport DisposeType MagickGetImageDispose(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(UndefinedDispose); } return((DisposeType) wand->images->dispose); @@ -4525,7 +4525,7 @@ WandExport double *MagickGetImageDistortions(MagickWand *wand, if ((wand->images == (Image *) NULL) || (reference->images == (Image *) NULL)) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((double *) NULL); } channel_distortion=GetImageDistortions(wand->images,reference->images, @@ -4564,7 +4564,7 @@ WandExport EndianType MagickGetImageEndian(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(UndefinedEndian); } return(wand->images->endian); @@ -4602,7 +4602,7 @@ WandExport char *MagickGetImageFilename(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((char *) NULL); } return(AcquireString(wand->images->filename)); @@ -4640,7 +4640,7 @@ WandExport char *MagickGetImageFormat(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((char *) NULL); } return(AcquireString(wand->images->magick)); @@ -4677,7 +4677,7 @@ WandExport double MagickGetImageFuzz(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(0.0); } return(wand->images->fuzz); @@ -4714,7 +4714,7 @@ WandExport double MagickGetImageGamma(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(0.0); } return(wand->images->gamma); @@ -4751,7 +4751,7 @@ WandExport GravityType MagickGetImageGravity(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(UndefinedGravity); } return(wand->images->gravity); @@ -4877,7 +4877,7 @@ WandExport PixelWand **MagickGetImageHistogram(MagickWand *wand, if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((PixelWand **) NULL); } histogram=GetImageHistogram(wand->images,number_colors,wand->exception); @@ -4924,7 +4924,7 @@ WandExport InterlaceType MagickGetImageInterlaceScheme(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(UndefinedInterlace); } return(wand->images->interlace); @@ -4964,7 +4964,7 @@ WandExport PixelInterpolateMethod MagickGetImageInterpolateMethod( if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(UndefinedInterpolatePixel); } return(wand->images->interpolate); @@ -5110,7 +5110,7 @@ WandExport OrientationType MagickGetImageOrientation(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(UndefinedOrientation); } return(wand->images->orientation); @@ -5348,7 +5348,7 @@ WandExport RenderingIntent MagickGetImageRenderingIntent(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(UndefinedIntent); } return((RenderingIntent) wand->images->rendering_intent); @@ -5466,7 +5466,7 @@ WandExport char *MagickGetImageSignature(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((char *) NULL); } status=SignatureImage(wand->images,wand->exception); @@ -5550,7 +5550,7 @@ WandExport ImageType MagickGetImageType(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(UndefinedType); } return(GetImageType(wand->images,wand->exception)); @@ -5587,7 +5587,7 @@ WandExport ResolutionType MagickGetImageUnits(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(UndefinedResolution); } return(wand->images->units); @@ -5625,7 +5625,7 @@ WandExport VirtualPixelMethod MagickGetImageVirtualPixelMethod(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(UndefinedVirtualPixelMethod); } return(GetImageVirtualPixelMethod(wand->images)); @@ -5768,7 +5768,7 @@ WandExport double MagickGetImageTotalInkDensity(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(0.0); } return(GetImageTotalInkDensity(wand->images,wand->exception)); @@ -5933,7 +5933,7 @@ WandExport char *MagickIdentifyImage(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((char *) NULL); } description=(char *) NULL; @@ -5944,7 +5944,7 @@ WandExport char *MagickIdentifyImage(MagickWand *wand) if ((unique_file == -1) || (file == (FILE *) NULL)) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "UnableToCreateTemporaryFile","'%s'",wand->name); + "UnableToCreateTemporaryFile","`%s'",wand->name); return((char *) NULL); } (void) IdentifyImage(wand->images,file,MagickTrue,wand->exception); @@ -10039,7 +10039,7 @@ WandExport MagickProgressMonitor MagickSetImageProgressMonitor(MagickWand *wand, if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((MagickProgressMonitor) NULL); } previous_monitor=SetImageProgressMonitor(wand->images, @@ -10768,7 +10768,7 @@ WandExport MagickWand *MagickSimilarityImage(MagickWand *wand, if ((wand->images == (Image *) NULL) || (reference->images == (Image *) NULL)) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((MagickWand *) NULL); } similarity_image=SimilarityImage(wand->images,reference->images,metric,offset, @@ -11195,7 +11195,7 @@ WandExport MagickWand *MagickSteganoImage(MagickWand *wand, (watermark_wand->images == (Image *) NULL)) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((MagickWand *) NULL); } wand->images->offset=offset; @@ -11246,7 +11246,7 @@ WandExport MagickWand *MagickStereoImage(MagickWand *wand, (offset_wand->images == (Image *) NULL)) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((MagickWand *) NULL); } stereo_image=StereoImage(wand->images,offset_wand->images,wand->exception); @@ -11379,7 +11379,7 @@ WandExport MagickWand *MagickTextureImage(MagickWand *wand, (texture_wand->images == (Image *) NULL)) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((MagickWand *) NULL); } texture_image=CloneImage(wand->images,0,0,MagickTrue,wand->exception); diff --git a/MagickWand/magick-property.c b/MagickWand/magick-property.c index f339b043e..d0ec8c630 100644 --- a/MagickWand/magick-property.c +++ b/MagickWand/magick-property.c @@ -58,7 +58,7 @@ #define ThrowWandException(severity,tag,context) \ { \ (void) ThrowMagickException(wand->exception,GetMagickModule(),severity, \ - tag,"'%s'",context); \ + tag,"`%s'",context); \ return(MagickFalse); \ } @@ -98,7 +98,7 @@ WandExport MagickBooleanType MagickDeleteImageArtifact(MagickWand *wand, if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(MagickFalse); } return(DeleteImageArtifact(wand->images,artifact)); @@ -140,7 +140,7 @@ WandExport MagickBooleanType MagickDeleteImageProperty(MagickWand *wand, if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return(MagickFalse); } return(DeleteImageProperty(wand->images,property)); @@ -574,7 +574,7 @@ WandExport char *MagickGetImageArtifact(MagickWand *wand,const char *artifact) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((char *) NULL); } value=GetImageArtifact(wand->images,artifact); @@ -636,7 +636,7 @@ WandExport char **MagickGetImageArtifacts(MagickWand *wand, if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((char **) NULL); } (void) GetImageProperty(wand->images,"exif:*",wand->exception); @@ -659,7 +659,7 @@ WandExport char **MagickGetImageArtifacts(MagickWand *wand, if (artifacts == (char **) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", wand->name); return((char **) NULL); } @@ -718,7 +718,7 @@ WandExport unsigned char *MagickGetImageProfile(MagickWand *wand, if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((unsigned char *) NULL); } *length=0; @@ -790,7 +790,7 @@ WandExport char **MagickGetImageProfiles(MagickWand *wand,const char *pattern, if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((char **) NULL); } (void) GetImageProfile(wand->images,"exif:*"); @@ -813,7 +813,7 @@ WandExport char **MagickGetImageProfiles(MagickWand *wand,const char *pattern, if (profiles == (char **) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", wand->name); return((char **) NULL); } @@ -867,7 +867,7 @@ WandExport char *MagickGetImageProperty(MagickWand *wand,const char *property) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((char *) NULL); } value=GetImageProperty(wand->images,property,wand->exception); @@ -929,7 +929,7 @@ WandExport char **MagickGetImageProperties(MagickWand *wand, if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((char **) NULL); } (void) GetImageProperty(wand->images,"exif:*",wand->exception); @@ -952,7 +952,7 @@ WandExport char **MagickGetImageProperties(MagickWand *wand, if (properties == (char **) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", wand->name); return((char **) NULL); } @@ -1135,7 +1135,7 @@ WandExport char **MagickGetOptions(MagickWand *wand,const char *pattern, if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((char **) NULL); } length=1024; @@ -1157,7 +1157,7 @@ WandExport char **MagickGetOptions(MagickWand *wand,const char *pattern, if (options == (char **) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","'%s'", + ResourceLimitError,"MemoryAllocationFailed","`%s'", wand->name); return((char **) NULL); } @@ -1810,7 +1810,7 @@ WandExport unsigned char *MagickRemoveImageProfile(MagickWand *wand, if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((unsigned char *) NULL); } *length=0; diff --git a/MagickWand/magick-wand.c b/MagickWand/magick-wand.c index 78d950705..ea6ed3312 100644 --- a/MagickWand/magick-wand.c +++ b/MagickWand/magick-wand.c @@ -57,7 +57,7 @@ #define ThrowWandException(severity,tag,context) \ { \ (void) ThrowMagickException(wand->exception,GetMagickModule(),severity, \ - tag,"'%s'",context); \ + tag,"`%s'",context); \ return(MagickFalse); \ } @@ -297,7 +297,7 @@ WandExport char *MagickGetException(const MagickWand *wand, if (description == (char *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "MemoryAllocationFailed","'%s'",wand->name); + "MemoryAllocationFailed","`%s'",wand->name); return((char *) NULL); } *description='\0'; @@ -378,7 +378,7 @@ WandExport ssize_t MagickGetIteratorIndex(MagickWand *wand) if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoIterators","'%s'",wand->name); + "ContainsNoIterators","`%s'",wand->name); return(-1); } return(GetImageIndexInList(wand->images)); @@ -542,7 +542,7 @@ WandExport double *MagickQueryFontMetrics(MagickWand *wand, if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((double *) NULL); } font_metrics=(double *) AcquireQuantumMemory(13UL,sizeof(*font_metrics)); @@ -649,7 +649,7 @@ WandExport double *MagickQueryMultilineFontMetrics(MagickWand *wand, if (wand->images == (Image *) NULL) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, - "ContainsNoImages","'%s'",wand->name); + "ContainsNoImages","`%s'",wand->name); return((double *) NULL); } font_metrics=(double *) AcquireQuantumMemory(13UL,sizeof(*font_metrics)); diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 2037a85fb..de08ab23d 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -3561,7 +3561,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info, } #define ThrowMogrifyException(asperity,tag,option) \ { \ - (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"'%s'", \ + (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"`%s'", \ option); \ DestroyMogrify(); \ return(MagickFalse); \ @@ -7693,7 +7693,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, if (p == (Image *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"NoSuchImage","'%s'",argv[i+1]); + OptionError,"NoSuchImage","`%s'",argv[i+1]); status=MagickFalse; break; } @@ -7709,7 +7709,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, if (q == (Image *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"NoSuchImage","'%s'",argv[i+1]); + OptionError,"NoSuchImage","`%s'",argv[i+1]); status=MagickFalse; break; } @@ -8195,7 +8195,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, if ((p == (Image *) NULL) || (q == (Image *) NULL)) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError,"NoSuchImage","'%s'",(*images)->filename); + OptionError,"NoSuchImage","`%s'",(*images)->filename); status=MagickFalse; break; } diff --git a/MagickWand/montage.c b/MagickWand/montage.c index f095b3243..09975af6b 100644 --- a/MagickWand/montage.c +++ b/MagickWand/montage.c @@ -271,7 +271,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, } #define ThrowMontageException(asperity,tag,option) \ { \ - (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"'%s'", \ + (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"`%s'", \ option); \ DestroyMontage(); \ return(MagickFalse); \ diff --git a/MagickWand/stream.c b/MagickWand/stream.c index 19669ecdc..1962adf84 100644 --- a/MagickWand/stream.c +++ b/MagickWand/stream.c @@ -171,7 +171,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info, } #define ThrowStreamException(asperity,tag,option) \ { \ - (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"'%s'", \ + (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag,"`%s'", \ option); \ DestroyStream(); \ return(MagickFalse); \ diff --git a/MagickWand/studio.h b/MagickWand/studio.h index d9dadbb71..9a4d3cf1e 100644 --- a/MagickWand/studio.h +++ b/MagickWand/studio.h @@ -361,7 +361,7 @@ extern int vsnprintf(char *,size_t,const char *,va_list); \ fatal_exception=AcquireExceptionInfo(); \ (void) ThrowMagickException(fatal_exception,GetMagickModule(),severity,tag, \ - "'%s'",(context)); \ + "`%s'",(context)); \ CatchException(fatal_exception); \ fatal_exception=DestroyExceptionInfo(fatal_exception); \ } diff --git a/MagickWand/wandcli-private.h b/MagickWand/wandcli-private.h index 0bb0ca2dc..33a57efbd 100644 --- a/MagickWand/wandcli-private.h +++ b/MagickWand/wandcli-private.h @@ -24,7 +24,7 @@ extern "C" { #define CLIWandException(severity,tag,option) \ (void) CLIThrowException(cli_wand,GetMagickModule(),severity,tag, \ - "'%s'",option) + "`%s'",option) #define CLIWandExceptionArg(severity,tag,option,arg) \ (void) CLIThrowException(cli_wand,GetMagickModule(),severity,tag, \