From: anthony Date: Sat, 21 Apr 2012 05:37:29 +0000 (+0000) Subject: Stop convert generating single space filenames X-Git-Tag: 7.0.1-0~5758 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5b39652d8d21bc3940d83b8d6088d4070a8a34a;p=imagemagick Stop convert generating single space filenames And remove stupid backtick quotes from filenames --- diff --git a/MagickCore/ImageMagick.pc b/MagickCore/ImageMagick.pc index 7af081e15..7ca1fc7d0 100644 --- a/MagickCore/ImageMagick.pc +++ b/MagickCore/ImageMagick.pc @@ -7,4 +7,4 @@ Name: ImageMagick Description: ImageMagick - Convert, Edit, and Compose Images Version: 7.0.0 Libs: -L${libdir} -lMagickCore -Cflags: -I${includedir} -fopenmp +Cflags: -I${includedir} diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c index 144e8c4db..772e30ea6 100644 --- a/MagickCore/accelerate.c +++ b/MagickCore/accelerate.c @@ -316,7 +316,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, @@ -496,7 +496,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)); @@ -509,7 +509,7 @@ static ConvolveInfo *GetConvolveInfo(const Image *image,const char *name, if (status != CL_SUCCESS) { (void) ThrowMagickException(exception,GetMagickModule(),DelegateWarning, - "failed to create OpenCL context","`%s' (%d)",image->filename,status); + "failed to create OpenCL context","'%s' (%d)",image->filename,status); convolve_info=DestroyConvolveInfo(convolve_info); return((ConvolveInfo *) NULL); } @@ -527,7 +527,7 @@ static ConvolveInfo *GetConvolveInfo(const Image *image,const char *name, if ((convolve_info->context == (cl_context) NULL) || (status != CL_SUCCESS)) { (void) ThrowMagickException(exception,GetMagickModule(),DelegateWarning, - "failed to create OpenCL context","`%s' (%d)",image->filename,status); + "failed to create OpenCL context","'%s' (%d)",image->filename,status); convolve_info=DestroyConvolveInfo(convolve_info); return((ConvolveInfo *) NULL); } @@ -545,7 +545,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); } @@ -630,7 +630,7 @@ static ConvolveInfo *GetConvolveInfo(const Image *image,const char *name, status=clGetProgramBuildInfo(convolve_info->program, convolve_info->devices[0],CL_PROGRAM_BUILD_LOG,length,log,&length); (void) ThrowMagickException(exception,GetMagickModule(),DelegateWarning, - "failed to build OpenCL program","`%s' (%s)",image->filename,log); + "failed to build OpenCL program","'%s' (%s)",image->filename,log); log=DestroyString(log); convolve_info=DestroyConvolveInfo(convolve_info); return((ConvolveInfo *) NULL); @@ -703,7 +703,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); @@ -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); } filter=(float *) AcquireQuantumMemory(kernel->width,kernel->height* @@ -721,7 +721,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 81ad3b21c..68c6332cd 100644 --- a/MagickCore/animate.c +++ b/MagickCore/animate.c @@ -304,7 +304,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) @@ -3038,7 +3038,7 @@ MagickExport MagickBooleanType AnimateImages(const ImageInfo *image_info, if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError, - "DelegateLibrarySupportNotBuiltIn","`%s' (X11)",image->filename); + "DelegateLibrarySupportNotBuiltIn","'%s' (X11)",image->filename); return(MagickFalse); } #endif diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c index d61fb064b..233edb741 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) && @@ -1552,7 +1552,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info, TypeMetric *metrics,ExceptionInfo *exception) { (void) ThrowMagickException(exception,GetMagickModule(), - MissingDelegateWarning,"DelegateLibrarySupportNotBuiltIn","`%s' (Freetype)", + MissingDelegateWarning,"DelegateLibrarySupportNotBuiltIn","'%s' (Freetype)", draw_info->font != (char *) NULL ? draw_info->font : "none"); return(RenderPostscript(image,draw_info,offset,metrics,exception)); } @@ -2094,7 +2094,7 @@ static MagickBooleanType RenderX11(Image *image,const DrawInfo *draw_info, (void) offset; (void) metrics; (void) ThrowMagickException(exception,GetMagickModule(), - MissingDelegateError,"DelegateLibrarySupportNotBuiltIn","`%s' (X11)", + MissingDelegateError,"DelegateLibrarySupportNotBuiltIn","'%s' (X11)", image->filename); return(MagickFalse); } diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index 89f9abc11..0274fd5d0 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -231,7 +231,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 51fc9a920..99d1931bb 100644 --- a/MagickCore/blob.c +++ b/MagickCore/blob.c @@ -346,7 +346,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); @@ -359,7 +359,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); } @@ -983,7 +983,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) @@ -1005,7 +1005,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); @@ -1496,7 +1496,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); } @@ -1511,7 +1511,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); @@ -1644,7 +1644,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; @@ -1751,7 +1751,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); } @@ -1766,7 +1766,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; @@ -2366,7 +2366,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) || @@ -2677,7 +2677,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); @@ -2685,7 +2685,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); diff --git a/MagickCore/cache.c b/MagickCore/cache.c index 95fd4d5a3..663d0e54a 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -633,7 +633,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); } @@ -801,7 +801,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); } @@ -3100,7 +3100,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* @@ -3130,7 +3130,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, @@ -3832,7 +3832,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)) @@ -4127,14 +4127,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; @@ -4741,7 +4741,7 @@ static inline MagickBooleanType AcquireCacheNexusPixels(CacheInfo *cache_info, 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 ce0bc95b4..149df0b14 100644 --- a/MagickCore/channel.c +++ b/MagickCore/channel.c @@ -302,7 +302,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); } @@ -341,7 +341,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 5a97d2328..df953a5c5 100644 --- a/MagickCore/coder.c +++ b/MagickCore/coder.c @@ -752,7 +752,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 @@ -800,7 +800,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; } @@ -918,7 +918,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)); @@ -931,7 +931,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 a1dff15ea..000fcc70e 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)); @@ -1896,7 +1896,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 @@ -1943,7 +1943,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; } @@ -2076,7 +2076,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)); @@ -2093,7 +2093,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. @@ -2225,7 +2225,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 @@ -2291,7 +2291,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 3a848ea43..279fc8b0e 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 09dcf9c5d..fefc1aca1 100644 --- a/MagickCore/compare.c +++ b/MagickCore/compare.c @@ -1241,7 +1241,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); } /* @@ -1649,19 +1649,15 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference, } q+=GetPixelChannels(similarity_image); } - if (SyncCacheViewAuthenticPixels(similarity_view,exception) == MagickFalse) + if (IfMagickFalse( SyncCacheViewAuthenticPixels(similarity_view,exception) )) status=MagickFalse; if (image->progress_monitor != (MagickProgressMonitor) NULL) { - MagickBooleanType - proceed; - #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_SimilarityImage) #endif - proceed=SetImageProgress(image,SimilarityImageTag,progress++, - image->rows); - if (proceed == MagickFalse) + if (IfMagickFalse( SetImageProgress(image,SimilarityImageTag, + progress++,image->rows) )) status=MagickFalse; } } diff --git a/MagickCore/compress.c b/MagickCore/compress.c index 3de4ae6e7..0b099be30 100644 --- a/MagickCore/compress.c +++ b/MagickCore/compress.c @@ -1305,7 +1305,7 @@ MagickExport MagickBooleanType ZLIBEncodeImage(Image *image, if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError, - "DelegateLibrarySupportNotBuiltIn","`%s' (ZIP)",image->filename); + "DelegateLibrarySupportNotBuiltIn","'%s' (ZIP)",image->filename); return(MagickFalse); } #endif diff --git a/MagickCore/configure.c b/MagickCore/configure.c index da3a1ea8a..75ca67acd 100644 --- a/MagickCore/configure.c +++ b/MagickCore/configure.c @@ -592,7 +592,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); } @@ -1079,7 +1079,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 @@ -1127,7 +1127,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; } @@ -1248,7 +1248,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; } @@ -1261,7 +1261,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 bb464822c..4cc6d529a 100644 --- a/MagickCore/constitute.c +++ b/MagickCore/constitute.c @@ -458,7 +458,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); return((Image *) NULL); } /* @@ -537,7 +537,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); @@ -571,7 +571,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", @@ -613,7 +613,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); @@ -1185,7 +1185,7 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, if ((magick_info == (const MagickInfo *) NULL) || (GetImageEncoder(magick_info) == (EncodeImageHandler *) NULL)) (void) ThrowMagickException(exception,GetMagickModule(), - MissingDelegateError,"NoEncodeDelegateForThisImageFormat","`%s'", + MissingDelegateError,"NoEncodeDelegateForThisImageFormat","'%s'", image->filename); else { diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c index 3017c2308..775358488 100644 --- a/MagickCore/delegate.c +++ b/MagickCore/delegate.c @@ -276,21 +276,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. */ @@ -862,14 +862,14 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, { errno=EPERM; (void) ThrowMagickException(exception,GetMagickModule(),PolicyError, - "NotAuthorized","`%s'",decode); + "NotAuthorized","'%s'",decode); return(MagickFalse); } if (IsRightsAuthorized(DelegatePolicyDomain,rights,encode) == MagickFalse) { errno=EPERM; (void) ThrowMagickException(exception,GetMagickModule(),PolicyError, - "NotAuthorized","`%s'",encode); + "NotAuthorized","'%s'",encode); return(MagickFalse); } temporary=(*image->filename == '\0') ? MagickTrue : MagickFalse; @@ -886,7 +886,7 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, if (temporary != MagickFalse) (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') @@ -940,7 +940,7 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, if (temporary != MagickFalse) (void) RelinquishUniqueFileResource(image->filename); (void) ThrowMagickException(exception,GetMagickModule(), - DelegateError,"DelegateFailed","`%s'",decode ? decode : encode); + DelegateError,"DelegateFailed","'%s'",decode ? decode : encode); return(MagickFalse); } LocaleUpper(magick); @@ -971,7 +971,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 (clone_info->adjoin != MagickFalse) @@ -990,7 +990,7 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, if (temporary != MagickFalse) (void) RelinquishUniqueFileResource(image->filename); (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","`%s'", + ResourceLimitError,"MemoryAllocationFailed","'%s'", decode ? decode : encode); return(MagickFalse); } @@ -1053,7 +1053,7 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, if (status != MagickFalse) { (void) ThrowMagickException(exception,GetMagickModule(),DelegateError, - "DelegateFailed","`%s'",commands[i]); + "DelegateFailed","'%s'",commands[i]); break; } commands[i]=DestroyString(commands[i]); @@ -1275,7 +1275,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 @@ -1322,7 +1322,7 @@ static MagickBooleanType LoadDelegateList(const char *xml,const char *filename, status=AppendValueToLinkedList(delegate_list,delegate_info); if (status == MagickFalse) (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 6e22d6903..fafdb01ca 100644 --- a/MagickCore/display.c +++ b/MagickCore/display.c @@ -1680,7 +1680,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) @@ -1758,7 +1758,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); @@ -5512,7 +5512,7 @@ static MagickBooleanType XDrawEditImage(Display *display, if (coordinate_info == (XPoint *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","`%s'","..."); + ResourceLimitError,"MemoryAllocationFailed","'%s'","..."); return(MagickFalse); } /* @@ -6137,7 +6137,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: @@ -6164,7 +6164,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: @@ -13309,7 +13309,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % XTranslateImage() translates the image within an Image window by one pixel -% as specified by the key symbol. If the image has a `montage string the +% as specified by the key symbol. If the image has a montage string the % translation is respect to the width and height contained within the string. % % The format of the XTranslateImage method is: @@ -16194,7 +16194,7 @@ MagickExport MagickBooleanType DisplayImages(const ImageInfo *image_info, if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); (void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError, - "DelegateLibrarySupportNotBuiltIn","`%s' (X11)",image->filename); + "DelegateLibrarySupportNotBuiltIn","'%s' (X11)",image->filename); return(MagickFalse); } @@ -16237,7 +16237,7 @@ MagickExport MagickBooleanType RemoteDisplayCommand(const ImageInfo *image_info, (void) window; (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename); (void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError, - "DelegateLibrarySupportNotBuiltIn","`%s' (X11)",image_info->filename); + "DelegateLibrarySupportNotBuiltIn","'%s' (X11)",image_info->filename); return(MagickFalse); } #endif diff --git a/MagickCore/draw.c b/MagickCore/draw.c index 21008fbb2..7c6696902 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -2242,7 +2242,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; } @@ -2407,7 +2407,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; } @@ -2550,7 +2550,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; } @@ -2782,7 +2782,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; } } @@ -2829,7 +2829,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; } @@ -2888,7 +2888,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/enhance.c b/MagickCore/enhance.c index 0f85e582d..ca2399db0 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -965,11 +965,11 @@ MagickExport MagickBooleanType ContrastImage(Image *image, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % ContrastStretchImage() is a simple image enhancement technique that attempts -% to improve the contrast in an image by `stretching' the range of intensity +% to improve the contrast in an image by 'stretching' the range of intensity % values it contains to span a desired range of values. It differs from the % more sophisticated histogram equalization in that it can only apply a % linear scaling function to the image pixel values. As a result the -% `enhancement' is less harsh. +% 'enhancement' is less harsh. % % The format of the ContrastStretchImage method is: % diff --git a/MagickCore/exception-private.h b/MagickCore/exception-private.h index f558eae38..6376a2b61 100644 --- a/MagickCore/exception-private.h +++ b/MagickCore/exception-private.h @@ -29,7 +29,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) \ @@ -43,7 +43,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); \ @@ -56,19 +56,19 @@ extern "C" { \ message=GetExceptionMessage(errno); \ (void) ThrowMagickException(exception,GetMagickModule(),severity, \ - tag == (const char *) NULL ? "unknown" : tag,"`%s': %s",context,message); \ + tag == (const char *) NULL ? "unknown" : tag,"'%s': %s",context,message); \ message=DestroyString(message); \ } #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); \ @@ -79,7 +79,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 f48a7ee2e..39163a31b 100644 --- a/MagickCore/feature.c +++ b/MagickCore/feature.c @@ -208,7 +208,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++) @@ -338,7 +338,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)); @@ -387,7 +387,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); } /* @@ -520,7 +520,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 8beebffb4..139ed4e49 100644 --- a/MagickCore/fourier.c +++ b/MagickCore/fourier.c @@ -249,7 +249,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); } /* @@ -266,7 +266,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); } @@ -430,7 +430,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* @@ -484,7 +484,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); } @@ -572,7 +572,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, @@ -580,7 +580,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); } @@ -589,7 +589,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); @@ -615,7 +615,7 @@ MagickExport Image *ForwardFourierTransformImage(const Image *image, #if !defined(MAGICKCORE_FFTW_DELEGATE) (void) modulus; (void) ThrowMagickException(exception,GetMagickModule(), - MissingDelegateWarning,"DelegateLibrarySupportNotBuiltIn","`%s' (FFTW)", + MissingDelegateWarning,"DelegateLibrarySupportNotBuiltIn","'%s' (FFTW)", image->filename); #else { @@ -837,7 +837,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); } @@ -846,7 +846,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); @@ -955,7 +955,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); @@ -969,7 +969,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); @@ -1039,7 +1039,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) @@ -1142,7 +1142,7 @@ static MagickBooleanType InverseFourierTransformChannel( if (magnitude == (double *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitError,"MemoryAllocationFailed","`%s'", + ResourceLimitError,"MemoryAllocationFailed","'%s'", magnitude_image->filename); return(MagickFalse); } @@ -1151,7 +1151,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); @@ -1161,7 +1161,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); @@ -1194,14 +1194,14 @@ 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) fourier_image=(Image *) NULL; (void) modulus; (void) ThrowMagickException(exception,GetMagickModule(), - MissingDelegateWarning,"DelegateLibrarySupportNotBuiltIn","`%s' (FFTW)", + MissingDelegateWarning,"DelegateLibrarySupportNotBuiltIn","'%s' (FFTW)", magnitude_image->filename); #else { diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 310855178..a1fb3b2bc 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -1252,7 +1252,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); } @@ -1400,7 +1400,7 @@ static MagickRealType 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); @@ -1467,7 +1467,7 @@ static MagickRealType 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); } @@ -1493,7 +1493,7 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, break; } (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnableToParseExpression","`%s'",p); + "UnableToParseExpression","'%s'",p); return(0.0); } switch (*symbol) @@ -1625,7 +1625,7 @@ static MagickRealType 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); } @@ -1815,7 +1815,7 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const PixelChannel channel, if (value != (const char *) NULL) return((MagickRealType) StringToDouble(value,(char **) NULL)); (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnableToParseExpression","`%s'",symbol); + "UnableToParseExpression","'%s'",symbol); return(0.0); } @@ -2093,7 +2093,7 @@ static MagickRealType FxEvaluateSubexpression(FxInfo *fx_info, if (*expression == '\0') { (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "MissingExpression","`%s'",expression); + "MissingExpression","'%s'",expression); return(0.0); } *subexpression='\0'; @@ -2136,7 +2136,7 @@ static MagickRealType 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)); @@ -2148,7 +2148,7 @@ static MagickRealType 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)); @@ -2240,7 +2240,7 @@ static MagickRealType 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) @@ -2260,7 +2260,7 @@ static MagickRealType 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 dba5c33b3..0a6f4dc57 100644 --- a/MagickCore/geometry.c +++ b/MagickCore/geometry.c @@ -1042,7 +1042,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) @@ -1333,7 +1333,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) @@ -1390,7 +1390,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 6a04abc62..beb402e9d 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 93ae4fe59..5e51c26c6 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -2532,10 +2532,10 @@ MagickExport MagickBooleanType SetImageExtent(Image *image,const size_t columns, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% SetImageInfo() initializes the `magick' field of the ImageInfo structure. +% SetImageInfo() initializes the 'magick' field of the ImageInfo structure. % It is set to a type of image format based on the prefix or suffix of the -% filename. For example, `ps:image' returns PS indicating a Postscript image. -% JPEG is returned for this filename: `image.jpg'. The filename prefix has +% filename. For example, 'ps:image' returns PS indicating a Postscript image. +% JPEG is returned for this filename: 'image.jpg'. The filename prefix has % precendence over the suffix. Use an optional index enclosed in brackets % after a file name to specify a desired scene of a multi-resolution image % format like Photo CD (e.g. img0001.pcd[4]). A True (non-zero) return value @@ -3757,7 +3757,7 @@ MagickExport MagickBooleanType SyncImage(Image *image,ExceptionInfo *exception) image_view=DestroyCacheView(image_view); if (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 e87cc13d4..d80c2ca1f 100644 --- a/MagickCore/layer.c +++ b/MagickCore/layer.c @@ -1680,7 +1680,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 1cd6d5c87..4240b2414 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 7164f5a5e..70ac21ae1 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 042ffba29..07a7c9f6b 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 cfbfa56c1..f63573bc8 100644 --- a/MagickCore/magic.c +++ b/MagickCore/magic.c @@ -739,7 +739,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 @@ -786,7 +786,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; } @@ -966,7 +966,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)); @@ -981,7 +981,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/magick-type.h b/MagickCore/magick-type.h index 97f2b9e11..a03672052 100644 --- a/MagickCore/magick-type.h +++ b/MagickCore/magick-type.h @@ -161,30 +161,34 @@ typedef enum /* Define some short-hand macros for handling MagickBooleanType - Some of these assume MagickBooleanType uses values 0 and 1, and uses fast C typing with C boolean operations - Is -- returns MagickBooleanType + Is -- returns a MagickBooleanType (for storage) If -- returns C integer boolean (for if's and while's) - IsTrue() converts a C integer boolean to a MagickBooleanType - IsFalse() is a MagickBooleanType 'not' operation + IfMagickTrue() converts MagickBooleanType to C integer Boolean + IfMagickFalse() Not the MagickBooleanType to C integer Boolean - IfTrue() converts MagickBooleanType to C integer Boolean - IfFalse() Not the MagickBooleanType to C integer Boolean + IsMagickTrue() converts a C integer boolean to a MagickBooleanType + IsMagickFalse() converts and is also a MagickBooleanType 'not' operation - IsNULL() and IsNotNULL() converts C pointers to MagickBooleanType + IsMagickNULL() + IsMagickNotNULL() converts C pointers tests MagickBooleanType */ #if 1 -# define IsMagickTrue(v) ((MagickBooleanType)((int)(v)!= 0)) -# define IsMagickFalse(v) ((MagickBooleanType)(!(int)(v))) +/* Fast C typing method assumes MagickBooleanType uses match 0,1 values */ # define IfMagickTrue(v) ((int)(v)) # define IfMagickFalse(v) (!(int)(v)) +# define IsMagickTrue(v) ((MagickBooleanType)((int)(v)!=0)) +# define IsMagickFalse(v) ((MagickBooleanType)(!(int)(v))) +# define IsMagickNot(v) ((MagickBooleanType)(!(int)(v))) #else -# define IsMagickTrue(v) (((MagickBooleanType)(v))!=MagickFalse?MagickTrue:MagickFalse) -# define IsMagickFalse(v) (((MagickBooleanType)(v))==MagickFalse?MagickTrue:MagickFalse) +/* Do not depend MagickBooleanValues */ # define IfMagickTrue(v) ((v) != MagickFalse) # define IfMagickFalse(v) ((v) == MagickFalse) +# define IsMagickTrue(v) ((v)?MagickTrue:MagickFalse) +# define IsMagickFalse(v) ((v)?MagickFalse:MagickTrue) +# define IsMagickNot(v) (IfMagickTrue(v)?MagickFalse:MagickTrue) #endif #define IfStringTrue(v) IfMagickTrue(IsStringTrue(v)) #define IfStringNotFalse(v) IfMagickTrue(IsStringNotFalse(v)) diff --git a/MagickCore/mime.c b/MagickCore/mime.c index 98acf07e6..b03a4fec8 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 d76e094ec..7b07864aa 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, @@ -978,7 +978,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); @@ -986,7 +986,7 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag, if (status == MagickFalse) { (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, - "UnableToLoadModule","`%s': %s",name,path); + "UnableToLoadModule","'%s': %s",name,path); return(MagickFalse); } /* @@ -996,7 +996,7 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag, if (handle == (ModuleHandle) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, - "UnableToLoadModule","`%s': %s",name,lt_dlerror()); + "UnableToLoadModule","'%s': %s",name,lt_dlerror()); return(MagickFalse); } /* @@ -1015,7 +1015,7 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag, image_filter=(ImageFilterHandler *) lt_dlsym(handle,name); if (image_filter == (ImageFilterHandler *) NULL) (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, - "UnableToLoadModule","`%s': %s",name,lt_dlerror()); + "UnableToLoadModule","'%s': %s",name,lt_dlerror()); else { size_t @@ -1030,7 +1030,7 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag, tag); if (signature != MagickImageFilterSignature) (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, - "ImageFilterSignatureMismatch","`%s': %8lx != %8lx",tag, + "ImageFilterSignatureMismatch","'%s': %8lx != %8lx",tag, (unsigned long) signature,(unsigned long) MagickImageFilterSignature); } /* @@ -1038,7 +1038,7 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag, */ if (lt_dlclose(handle) != 0) (void) ThrowMagickException(exception,GetMagickModule(),ModuleWarning, - "UnableToCloseModule","`%s': %s",name,lt_dlerror()); + "UnableToCloseModule","'%s': %s",name,lt_dlerror()); return(exception->severity < ErrorException ? MagickTrue : MagickFalse); } @@ -1281,7 +1281,7 @@ MagickPrivate MagickBooleanType OpenModule(const char *module, if (handle == (ModuleHandle) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, - "UnableToLoadModule","`%s': %s",path,lt_dlerror()); + "UnableToLoadModule","'%s': %s",path,lt_dlerror()); return(MagickFalse); } /* @@ -1299,7 +1299,7 @@ MagickPrivate MagickBooleanType OpenModule(const char *module, if (module_info->register_module == (size_t (*)(void)) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, - "UnableToRegisterImageFormat","`%s': %s",module_name,lt_dlerror()); + "UnableToRegisterImageFormat","'%s': %s",module_name,lt_dlerror()); return(MagickFalse); } (void) LogMagickEvent(ModuleEvent,GetMagickModule(), @@ -1313,7 +1313,7 @@ MagickPrivate MagickBooleanType OpenModule(const char *module, if (module_info->unregister_module == (void (*)(void)) NULL) { (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, - "UnableToRegisterImageFormat","`%s': %s",module_name,lt_dlerror()); + "UnableToRegisterImageFormat","'%s': %s",module_name,lt_dlerror()); return(MagickFalse); } (void) LogMagickEvent(ModuleEvent,GetMagickModule(), @@ -1323,7 +1323,7 @@ MagickPrivate MagickBooleanType OpenModule(const char *module, if (signature != MagickImageCoderSignature) { (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, - "ImageCoderSignatureMismatch","`%s': %8lx != %8lx",module_name, + "ImageCoderSignatureMismatch","'%s': %8lx != %8lx",module_name, (unsigned long) signature,(unsigned long) MagickImageCoderSignature); return(MagickFalse); } @@ -1424,7 +1424,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); } @@ -1608,7 +1608,7 @@ static MagickBooleanType UnregisterModule(const ModuleInfo *module_info, if (lt_dlclose((ModuleHandle) module_info->handle) != 0) { (void) ThrowMagickException(exception,GetMagickModule(),ModuleWarning, - "UnableToCloseModule","`%s': %s",module_info->tag,lt_dlerror()); + "UnableToCloseModule","'%s': %s",module_info->tag,lt_dlerror()); return(MagickFalse); } return(MagickTrue); @@ -1635,7 +1635,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) @@ -1656,7 +1656,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 @@ -1672,7 +1672,7 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag, if (signature != MagickImageFilterSignature) { (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, - "ImageFilterSignatureMismatch","`%s': %8lx != %8lx",tag, + "ImageFilterSignatureMismatch","'%s': %8lx != %8lx",tag, (unsigned long) signature,(unsigned long) MagickImageFilterSignature); return(MagickFalse); diff --git a/MagickCore/nt-feature.c b/MagickCore/nt-feature.c index b180e667b..d7cc8bc8a 100644 --- a/MagickCore/nt-feature.c +++ b/MagickCore/nt-feature.c @@ -544,7 +544,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 ); @@ -619,7 +619,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); } @@ -652,7 +652,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/option.c b/MagickCore/option.c index 9ce40324a..89e8140b6 100644 --- a/MagickCore/option.c +++ b/MagickCore/option.c @@ -2191,8 +2191,11 @@ MagickExport MagickBooleanType IsCommandOption(const char *option) if ((*option != '-') && (*option != '+')) return(MagickFalse); if (strlen(option) == 1) - return(MagickFalse); + return(IsMagickTrue( (*option == '{') || (*option == '}') + || (*option == '[') || (*option == ']') )); option++; + if (*option == '-') + return(MagickTrue); if (isalpha((int) ((unsigned char) *option)) == 0) return(MagickFalse); return(MagickTrue); diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index dc46381d0..e1dcc4b2a 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -1791,7 +1791,7 @@ MagickExport MagickBooleanType ExportImagePixels(const 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) strlen(map); i++) @@ -1818,7 +1818,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image, break; quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","`%s'",map); + "ColorSeparatedImageRequired","'%s'",map); return(MagickFalse); } case 'g': @@ -1841,7 +1841,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image, break; quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","`%s'",map); + "ColorSeparatedImageRequired","'%s'",map); return(MagickFalse); } case 'M': @@ -1852,7 +1852,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image, break; quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),ImageError, - "ColorSeparatedImageRequired","`%s'",map); + "ColorSeparatedImageRequired","'%s'",map); return(MagickFalse); } case 'o': @@ -1881,14 +1881,14 @@ MagickExport MagickBooleanType ExportImagePixels(const 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); } } @@ -1938,7 +1938,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image, { quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map); (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "UnrecognizedPixelMap","`%s'",map); + "UnrecognizedPixelMap","'%s'",map); break; } } @@ -3801,7 +3801,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); } } @@ -3856,7 +3856,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 6659e5070..996296273 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 ed4ba4ccf..0559f6e3c 100644 --- a/MagickCore/prepress.c +++ b/MagickCore/prepress.c @@ -103,7 +103,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 2b8b4e885..9bd8e57d3 100644 --- a/MagickCore/profile.c +++ b/MagickCore/profile.c @@ -456,14 +456,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) @@ -5765,7 +5765,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name, #if !defined(MAGICKCORE_LCMS_DELEGATE) (void) ThrowMagickException(exception,GetMagickModule(), MissingDelegateWarning,"DelegateLibrarySupportNotBuiltIn", - "`%s' (LCMS)",image->filename); + "'%s' (LCMS)",image->filename); #else { cmsHPROFILE diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c index 3283b5253..b52dbec17 100644 --- a/MagickCore/quantize.c +++ b/MagickCore/quantize.c @@ -863,7 +863,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++; @@ -2878,7 +2878,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 1b0afda70..4bd5300ee 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) @@ -2087,7 +2087,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) @@ -2254,7 +2254,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 65efe5437..2c2154e3a 100644 --- a/MagickCore/quantum-import.c +++ b/MagickCore/quantum-import.c @@ -921,7 +921,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) @@ -1249,7 +1249,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) @@ -1414,7 +1414,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) @@ -2233,7 +2233,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; @@ -2420,7 +2420,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, @@ -2445,7 +2445,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; @@ -2637,7 +2637,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 c2f692b7d..dc97d7163 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 f4eda5c37..b1dd5fd7b 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -1870,7 +1870,7 @@ MagickExport Image *LiquidRescaleImage(const Image *image, assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickSignature); (void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError, - "DelegateLibrarySupportNotBuiltIn","`%s' (LQR)",image->filename); + "DelegateLibrarySupportNotBuiltIn","'%s' (LQR)",image->filename); return((Image *) NULL); } #endif @@ -2179,7 +2179,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; @@ -2395,7 +2395,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 a3b0c6811..bbee6bd54 100644 --- a/MagickCore/segment.c +++ b/MagickCore/segment.c @@ -49,14 +49,14 @@ % % o For each histogram, successively apply the scale-space filter and % build an interval tree of zero crossings in the second derivative -% at each scale. Analyze this scale-space ``fingerprint'' to +% at each scale. Analyze this scale-space ''fingerprint'' to % determine which peaks and valleys in the histogram are most % predominant. % % o The fingerprint defines intervals on the axis of the histogram. % Each interval contains either a minima or a maxima in the original % signal. If each color component lies within the maxima interval, -% that pixel is considered ``classified'' and is assigned an unique +% that pixel is considered ''classified'' and is assigned an unique % class number. % % o Any pixel that fails to be classified in the above thresholding @@ -1002,7 +1002,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); } } @@ -1049,7 +1049,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); } @@ -1073,7 +1073,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 488803c21..7e568b732 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 7093dae86..265da6104 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 @@ -134,7 +134,7 @@ MagickExport MagickBooleanType InvokeStaticImageFilter(const char *tag, if (signature != MagickImageFilterSignature) { (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, - "ImageFilterSignatureMismatch","`%s': %8lx != %8lx",tag, + "ImageFilterSignatureMismatch","'%s': %8lx != %8lx",tag, (unsigned long) signature,(unsigned long) MagickImageFilterSignature); return(MagickFalse); diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index 087cb494a..99f194d9a 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -467,7 +467,7 @@ MagickExport Image *EvaluateImages(const Image *images, if ((next->columns != images->columns) || (next->rows != images->rows)) { (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "ImageWidthsOrHeightsDiffer","`%s'",images->filename); + "ImageWidthsOrHeightsDiffer","'%s'",images->filename); return((Image *) NULL); } /* @@ -488,7 +488,7 @@ MagickExport Image *EvaluateImages(const Image *images, { evaluate_image=DestroyImage(evaluate_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 7fe25e78f..cef10b0ae 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; @@ -875,14 +875,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; @@ -1310,7 +1310,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++) @@ -1337,7 +1337,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': @@ -1360,7 +1360,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': @@ -1371,7 +1371,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': @@ -1400,14 +1400,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); } } @@ -2624,7 +2624,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; } } @@ -2680,7 +2680,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 190b18efd..1ee8c2141 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -506,7 +506,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); @@ -556,7 +556,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 8e9d26c99..b066c30f2 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) @@ -1026,7 +1026,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 @@ -1078,7 +1078,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 57f35b383..0a4380586 100644 --- a/MagickCore/utility.c +++ b/MagickCore/utility.c @@ -1782,7 +1782,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); @@ -1857,7 +1857,7 @@ MagickExport int SystemCommand(const MagickBooleanType asynchronous, #endif if (status < 0) (void) ThrowMagickException(exception,GetMagickModule(),DelegateError, - "`%s' (%d)",command,status); + "'%s' (%d)",command,status); if (shell_command != command) shell_command=DestroyString(shell_command); for (i=0; i < (ssize_t) number_arguments; i++) diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c index d695547b3..2f1b4a25c 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); } @@ -2051,7 +2051,7 @@ MagickExport XMLTreeInfo *NewXMLTree(const char *xml,ExceptionInfo *exception) return(&root->root); } (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning, - "ParseError","unclosed tag: `%s'",root->node->tag); + "ParseError","unclosed tag: '%s'",root->node->tag); return(&root->root); } diff --git a/MagickCore/xwindow-private.h b/MagickCore/xwindow-private.h index eab3410b1..442802837 100644 --- a/MagickCore/xwindow-private.h +++ b/MagickCore/xwindow-private.h @@ -75,7 +75,7 @@ extern "C" { \ GetExceptionInfo(&exception); \ (void) ThrowMagickException(&exception,GetMagickModule(),severity, \ - tag == (const char *) NULL ? "unknown" : tag,"`%s': %s",context, \ + tag == (const char *) NULL ? "unknown" : tag,"'%s': %s",context, \ strerror(errno)); \ CatchException(&exception); \ (void) DestroyExceptionInfo(&exception); \ diff --git a/MagickWand/animate.c b/MagickWand/animate.c index 494497937..13be39c9b 100644 --- a/MagickWand/animate.c +++ b/MagickWand/animate.c @@ -213,7 +213,7 @@ static MagickBooleanType AnimateUsage(void) "-borderwidth, -font, -foreground, -iconGeometry, -iconic, -name,\n"); (void) printf("-mattecolor, -shared-memory, or -title.\n"); (void) printf( - "\nBy default, the image format of `file' is determined by its magic\n"); + "\nBy default, the image format of 'file' is determined by its magic\n"); (void) printf( "number. To specify a particular image format, precede the filename\n"); (void) printf( @@ -247,7 +247,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); \ @@ -255,7 +255,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info, #define ThrowAnimateInvalidArgumentException(option,argument) \ { \ (void) ThrowMagickException(exception,GetMagickModule(),OptionError, \ - "InvalidArgument","`%s': %s",option,argument); \ + "InvalidArgument","'%s': %s",option,argument); \ DestroyAnimate(); \ return(MagickFalse); \ } @@ -1472,7 +1472,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info, (void) argc; (void) argv; (void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError, - "DelegateLibrarySupportNotBuiltIn","`%s' (X11)",image_info->filename); + "DelegateLibrarySupportNotBuiltIn","'%s' (X11)",image_info->filename); return(AnimateUsage()); #endif } diff --git a/MagickWand/compare.c b/MagickWand/compare.c index 6d4cefbfc..7af002587 100644 --- a/MagickWand/compare.c +++ b/MagickWand/compare.c @@ -160,7 +160,7 @@ static MagickBooleanType CompareUsage(void) for (p=miscellaneous; *p != (char *) NULL; p++) (void) printf(" %s\n",*p); (void) printf( - "\nBy default, the image format of `file' is determined by its magic\n"); + "\nBy default, the image format of 'file' is determined by its magic\n"); (void) printf( "number. To specify a particular image format, precede the filename\n"); (void) printf( @@ -190,14 +190,14 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info, { \ if (exception->severity < (asperity)) \ (void) ThrowMagickException(exception,GetMagickModule(),asperity,tag, \ - "`%s'",option); \ + "'%s'",option); \ DestroyCompare(); \ return(MagickFalse); \ } #define ThrowCompareInvalidArgumentException(option,argument) \ { \ (void) ThrowMagickException(exception,GetMagickModule(),OptionError, \ - "InvalidArgument","`%s': %s",option,argument); \ + "InvalidArgument","'%s': %s",option,argument); \ DestroyCompare(); \ return(MagickFalse); \ } diff --git a/MagickWand/composite.c b/MagickWand/composite.c index b22331fbe..156157bf8 100644 --- a/MagickWand/composite.c +++ b/MagickWand/composite.c @@ -356,7 +356,7 @@ static MagickBooleanType CompositeUsage(void) for (p=miscellaneous; *p != (char *) NULL; p++) (void) printf(" %s\n",*p); (void) printf( - "\nBy default, the image format of `file' is determined by its magic\n"); + "\nBy default, the image format of 'file' is determined by its magic\n"); (void) printf( "number. To specify a particular image format, precede the filename\n"); (void) printf( @@ -395,7 +395,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); \ @@ -403,7 +403,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info, #define ThrowCompositeInvalidArgumentException(option,argument) \ { \ (void) ThrowMagickException(exception,GetMagickModule(),OptionError, \ - "InvalidArgument","`%s': %s",option,argument); \ + "InvalidArgument","'%s': %s",option,argument); \ DestroyComposite(); \ return(MagickFalse); \ } diff --git a/MagickWand/conjure.c b/MagickWand/conjure.c index 139e49bf2..bb51ddd8c 100644 --- a/MagickWand/conjure.c +++ b/MagickWand/conjure.c @@ -141,7 +141,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); \ @@ -149,7 +149,7 @@ WandExport MagickBooleanType ConjureImageCommand(ImageInfo *image_info, #define ThrowConjureInvalidArgumentException(option,argument) \ { \ (void) ThrowMagickException(exception,GetMagickModule(),OptionError, \ - "InvalidArgument","`%s': %s",option,argument); \ + "InvalidArgument","'%s': %s",option,argument); \ DestroyConjure(); \ return(MagickFalse); \ } diff --git a/MagickWand/convert.c b/MagickWand/convert.c index 016c0ac52..4bb8e332c 100644 --- a/MagickWand/convert.c +++ b/MagickWand/convert.c @@ -57,7 +57,7 @@ \ message=GetExceptionMessage(errno); \ (void) ThrowMagickException(exception,GetMagickModule(),severity, \ - tag == (const char *) NULL ? "unknown" : tag,"`%s': %s",context,message); \ + tag == (const char *) NULL ? "unknown" : tag,"'%s': %s",context,message); \ message=DestroyString(message); \ } @@ -186,7 +186,7 @@ static MagickBooleanType ConvertUsage(void) "-color-matrix matrix apply color correction to the image", "-contrast enhance or reduce the image contrast", "-contrast-stretch geometry", - " improve contrast by `stretching' the intensity range", + " improve contrast by 'stretching' the intensity range", "-convolve coefficients", " apply a convolution kernel to the image", "-cycle amount cycle the image colormap", @@ -228,7 +228,7 @@ static MagickBooleanType ConvertUsage(void) "-level-colors color,color", " level image with the given colors", "-linear-stretch geometry", - " improve contrast by `stretching with saturation'", + " improve contrast by 'stretching with saturation'", "-liquid-rescale geometry", " rescale image with seam-carving", "-median geometry apply a median filter to the image", @@ -460,7 +460,7 @@ static MagickBooleanType ConvertUsage(void) for (p=miscellaneous; *p != (char *) NULL; p++) (void) printf(" %s\n",*p); (void) printf( - "\nBy default, the image format of `file' is determined by its magic\n"); + "\nBy default, the image format of 'file' is determined by its magic\n"); (void) printf( "number. To specify a particular image format, precede the filename\n"); (void) printf( @@ -484,7 +484,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); \ @@ -492,7 +492,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info, #define ThrowConvertInvalidArgumentException(option,argument) \ { \ (void) ThrowMagickException(exception,GetMagickModule(),OptionError, \ - "InvalidArgument","`%s': %s",option,argument); \ + "InvalidArgument","'%s': %s",option,argument); \ DestroyConvert(); \ return(MagickFalse); \ } @@ -3019,10 +3019,12 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info, ThrowConvertException(OptionError,"UnbalancedParenthesis",argv[i]); if (i-- != (ssize_t) (argc-1)) ThrowConvertException(OptionError,"MissingAnImageFilename",argv[argc-1]); - if (image == (Image *) NULL) - ThrowConvertException(OptionError,"MissingAnImageFilename",argv[argc-1]); FinalizeImageSettings(image_info,image,MagickTrue); if (image == (Image *) NULL) + ThrowConvertException(OptionError,"NoImagesDefined",argv[argc-1]); + if (IsCommandOption(argv[argc-1])) + ThrowConvertException(OptionError,"MissingAnImageFilename",argv[argc-1]); + if (LocaleCompare(" ",argv[argc-1])==0) /* common line continuation error */ ThrowConvertException(OptionError,"MissingAnImageFilename",argv[argc-1]); status&=WriteImages(image_info,image,argv[argc-1],exception); if (metadata != (char **) NULL) diff --git a/MagickWand/display.c b/MagickWand/display.c index 427a8a4f2..dfeb76448 100644 --- a/MagickWand/display.c +++ b/MagickWand/display.c @@ -248,7 +248,7 @@ static MagickBooleanType DisplayUsage(void) "-borderwidth, -font, -foreground, -iconGeometry, -iconic, -mattecolor,\n"); (void) printf("-name, -shared-memory, -usePixmap, or -title.\n"); (void) printf( - "\nBy default, the image format of `file' is determined by its magic\n"); + "\nBy default, the image format of 'file' is determined by its magic\n"); (void) printf( "number. To specify a particular image format, precede the filename\n"); (void) printf( @@ -285,7 +285,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); \ @@ -293,7 +293,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info, #define ThrowDisplayInvalidArgumentException(option,argument) \ { \ (void) ThrowMagickException(exception,GetMagickModule(),OptionError, \ - "InvalidArgument","`%s': %s",option,argument); \ + "InvalidArgument","'%s': %s",option,argument); \ DestroyDisplay(); \ return(MagickFalse); \ } @@ -1907,7 +1907,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info, (void) argc; (void) argv; (void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError, - "DelegateLibrarySupportNotBuiltIn","`%s' (X11)",image_info->filename); + "DelegateLibrarySupportNotBuiltIn","'%s' (X11)",image_info->filename); return(DisplayUsage()); #endif } diff --git a/MagickWand/drawing-wand.c b/MagickWand/drawing-wand.c index 9a5a14d8c..a7d31d957 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 a2b4d7b78..c6fb6b83e 100644 --- a/MagickWand/identify.c +++ b/MagickWand/identify.c @@ -166,7 +166,7 @@ static MagickBooleanType IdentifyUsage(void) for (p=miscellaneous; *p != (char *) NULL; p++) (void) printf(" %s\n",*p); (void) printf( - "\nBy default, the image format of `file' is determined by its magic\n"); + "\nBy default, the image format of 'file' is determined by its magic\n"); (void) printf( "number. To specify a particular image format, precede the filename\n"); (void) printf( @@ -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); \ @@ -197,7 +197,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info, #define ThrowIdentifyInvalidArgumentException(option,argument) \ { \ (void) ThrowMagickException(exception,GetMagickModule(),OptionError, \ - "InvalidArgument","`%s': %s",option,argument); \ + "InvalidArgument","'%s': %s",option,argument); \ DestroyIdentify(); \ return(MagickFalse); \ } diff --git a/MagickWand/import.c b/MagickWand/import.c index 078986b1b..e38ba65b6 100644 --- a/MagickWand/import.c +++ b/MagickWand/import.c @@ -238,7 +238,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); \ @@ -246,7 +246,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info, #define ThrowImportInvalidArgumentException(option,argument) \ { \ (void) ThrowMagickException(exception,GetMagickModule(),OptionError, \ - "InvalidArgument","`%s': %s",option,argument); \ + "InvalidArgument","'%s': %s",option,argument); \ DestroyImport(); \ return(MagickFalse); \ } @@ -1308,7 +1308,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info, (void) argc; (void) argv; (void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError, - "DelegateLibrarySupportNotBuiltIn","`%s' (X11)",image_info->filename); + "DelegateLibrarySupportNotBuiltIn","'%s' (X11)",image_info->filename); return(ImportUsage()); #endif } diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c index 1d29d9aab..a926368d3 100644 --- a/MagickWand/magick-cli.c +++ b/MagickWand/magick-cli.c @@ -605,8 +605,11 @@ next_argument: if (LocaleCompare(option,"-exit") == 0 ) return(argc); /* just exit, no image write */ - /* If filename looks like an option -- produce an error */ - if (IsCommandOption(option) != MagickFalse) { + /* If filename looks like an option, + Or the common 'end of line' error of a single space. + -- produce an error */ + if (IfMagickTrue(IsCommandOption(option)) || + (option[0] == ' ' && option[1] == '\0') ) { CLIWandException(OptionError,"MissingOutputFilename",option); return(argc); } @@ -880,7 +883,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 7bb0b235a..5923ec36e 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" @@ -151,7 +151,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); @@ -1801,7 +1801,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, @@ -3619,7 +3619,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); @@ -3699,7 +3699,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); @@ -3789,7 +3789,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)); @@ -3839,7 +3839,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, @@ -3978,7 +3978,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)); @@ -4160,7 +4160,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)); @@ -4208,7 +4208,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); @@ -4247,7 +4247,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)); @@ -4285,7 +4285,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); @@ -4324,7 +4324,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); @@ -4362,7 +4362,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); @@ -4400,7 +4400,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); @@ -4506,7 +4506,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); @@ -4607,7 +4607,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, @@ -4648,7 +4648,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)); @@ -4687,7 +4687,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)); @@ -4725,7 +4725,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); @@ -4763,7 +4763,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); @@ -4801,7 +4801,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); @@ -4930,7 +4930,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); @@ -4978,7 +4978,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); @@ -5019,7 +5019,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); @@ -5169,7 +5169,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); @@ -5412,7 +5412,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); @@ -5533,7 +5533,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); @@ -5619,7 +5619,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)); @@ -5657,7 +5657,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); @@ -5696,7 +5696,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)); @@ -5843,7 +5843,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)); @@ -6012,7 +6012,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; @@ -6023,7 +6023,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); @@ -10129,7 +10129,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, @@ -10874,7 +10874,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, @@ -11309,7 +11309,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; @@ -11361,7 +11361,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); @@ -11497,7 +11497,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 baf507696..75a6b6ff4 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); } @@ -1134,7 +1134,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; @@ -1156,7 +1156,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); } @@ -1809,7 +1809,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 a7fe86b10..8b8d7a0d1 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 988a30e3b..3d8005477 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -491,7 +491,7 @@ static Image *SparseColorOption(const Image *image, if ( isalpha((int) token[0]) || token[0] == '#' ) { if ( color_from_image ) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError, "InvalidArgument", "`%s': %s", "sparse-color", + OptionError, "InvalidArgument", "'%s': %s", "sparse-color", "Color arg given, when colors are coming from image"); return( (Image *)NULL); } @@ -514,7 +514,7 @@ static Image *SparseColorOption(const Image *image, } if ( error ) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError, "InvalidArgument", "`%s': %s", "sparse-color", + OptionError, "InvalidArgument", "'%s': %s", "sparse-color", "Invalid number of Arguments"); return( (Image *)NULL); } @@ -537,7 +537,7 @@ static Image *SparseColorOption(const Image *image, if ( token[0] == '\0' ) break; if ( isalpha((int) token[0]) || token[0] == '#' ) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError, "InvalidArgument", "`%s': %s", "sparse-color", + OptionError, "InvalidArgument", "'%s': %s", "sparse-color", "Color found, instead of X-coord"); error = MagickTrue; break; @@ -548,7 +548,7 @@ static Image *SparseColorOption(const Image *image, if ( token[0] == '\0' ) break; if ( isalpha((int) token[0]) || token[0] == '#' ) { (void) ThrowMagickException(exception,GetMagickModule(), - OptionError, "InvalidArgument", "`%s': %s", "sparse-color", + OptionError, "InvalidArgument", "'%s': %s", "sparse-color", "Color found, instead of Y-coord"); error = MagickTrue; break; @@ -632,7 +632,7 @@ static Image *SparseColorOption(const Image *image, } if ( number_arguments != x && !error ) { (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "InvalidArgument","`%s': %s","sparse-color","Argument Parsing Error"); + "InvalidArgument","'%s': %s","sparse-color","Argument Parsing Error"); sparse_arguments=(double *) RelinquishMagickMemory(sparse_arguments); return( (Image *)NULL); } @@ -3300,7 +3300,7 @@ static MagickBooleanType MogrifyUsage(void) "-color-matrix matrix apply color correction to the image", "-contrast enhance or reduce the image contrast", "-contrast-stretch geometry", - " improve contrast by `stretching' the intensity range", + " improve contrast by 'stretching' the intensity range", "-convolve coefficients", " apply a convolution kernel to the image", "-cycle amount cycle the image colormap", @@ -3342,7 +3342,7 @@ static MagickBooleanType MogrifyUsage(void) "-level-colors color,color", " level image with the given colors", "-linear-stretch geometry", - " improve contrast by `stretching with saturation'", + " improve contrast by 'stretching with saturation'", "-liquid-rescale geometry", " rescale image with seam-carving", "-median geometry apply a median filter to the image", @@ -3600,7 +3600,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); \ @@ -3608,7 +3608,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info, #define ThrowMogrifyInvalidArgumentException(option,argument) \ { \ (void) ThrowMagickException(exception,GetMagickModule(),OptionError, \ - "InvalidArgument","`%s': %s",argument,option); \ + "InvalidArgument","'%s': %s",argument,option); \ DestroyMogrify(); \ return(MagickFalse); \ } @@ -7690,7 +7690,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; } @@ -7706,7 +7706,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; } @@ -8128,7 +8128,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 9c8a91063..8a3214555 100644 --- a/MagickWand/montage.c +++ b/MagickWand/montage.c @@ -248,7 +248,7 @@ static MagickBooleanType MontageUsage(void) (void) printf( "-borderwidth, -font, -mattecolor, or -title\n"); (void) printf( - "\nBy default, the image format of `file' is determined by its magic\n"); + "\nBy default, the image format of 'file' is determined by its magic\n"); (void) printf( "number. To specify a particular image format, precede the filename\n"); (void) printf( @@ -273,7 +273,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); \ @@ -281,7 +281,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, #define ThrowMontageInvalidArgumentException(option,argument) \ { \ (void) ThrowMagickException(exception,GetMagickModule(),OptionError, \ - "InvalidArgument","`%s': %s",option,argument); \ + "InvalidArgument","'%s': %s",option,argument); \ DestroyMontage(); \ return(MagickFalse); \ } diff --git a/MagickWand/stream.c b/MagickWand/stream.c index 782b95720..da91a8630 100644 --- a/MagickWand/stream.c +++ b/MagickWand/stream.c @@ -149,7 +149,7 @@ static MagickBooleanType StreamUsage(void) for (p=miscellaneous; *p != (char *) NULL; p++) (void) printf(" %s\n",*p); (void) printf( - "\nBy default, the image format of `file' is determined by its magic\n"); + "\nBy default, the image format of 'file' is determined by its magic\n"); (void) printf( "number. To specify a particular image format, precede the filename\n"); (void) printf( @@ -173,7 +173,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); \ @@ -181,7 +181,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info, #define ThrowStreamInvalidArgumentException(option,argument) \ { \ (void) ThrowMagickException(exception,GetMagickModule(),OptionError, \ - "InvalidArgument","`%s': %s",option,argument); \ + "InvalidArgument","'%s': %s",option,argument); \ DestroyStream(); \ return(MagickFalse); \ } diff --git a/MagickWand/studio.h b/MagickWand/studio.h index e1de6bd00..f5f8ef4d8 100644 --- a/MagickWand/studio.h +++ b/MagickWand/studio.h @@ -367,7 +367,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); \ }