]> granicus.if.org Git - imagemagick/commitdiff
Stop convert generating single space filenames
authoranthony <anthony@git.imagemagick.org>
Sat, 21 Apr 2012 05:37:29 +0000 (05:37 +0000)
committeranthony <anthony@git.imagemagick.org>
Sat, 21 Apr 2012 05:37:29 +0000 (05:37 +0000)
And remove stupid backtick quotes from filenames

72 files changed:
MagickCore/ImageMagick.pc
MagickCore/accelerate.c
MagickCore/animate.c
MagickCore/annotate.c
MagickCore/attribute.c
MagickCore/blob.c
MagickCore/cache.c
MagickCore/channel.c
MagickCore/coder.c
MagickCore/color.c
MagickCore/colormap-private.h
MagickCore/compare.c
MagickCore/compress.c
MagickCore/configure.c
MagickCore/constitute.c
MagickCore/delegate.c
MagickCore/display.c
MagickCore/draw.c
MagickCore/enhance.c
MagickCore/exception-private.h
MagickCore/feature.c
MagickCore/fourier.c
MagickCore/fx.c
MagickCore/geometry.c
MagickCore/histogram.c
MagickCore/image.c
MagickCore/layer.c
MagickCore/list.c
MagickCore/locale.c
MagickCore/log.c
MagickCore/magic.c
MagickCore/magick-type.h
MagickCore/mime.c
MagickCore/module.c
MagickCore/nt-feature.c
MagickCore/option.c
MagickCore/pixel.c
MagickCore/policy.c
MagickCore/prepress.c
MagickCore/profile.c
MagickCore/quantize.c
MagickCore/quantum-export.c
MagickCore/quantum-import.c
MagickCore/registry.c
MagickCore/resize.c
MagickCore/segment.c
MagickCore/shear.c
MagickCore/static.c
MagickCore/statistic.c
MagickCore/stream.c
MagickCore/transform.c
MagickCore/type.c
MagickCore/utility.c
MagickCore/xml-tree.c
MagickCore/xwindow-private.h
MagickWand/animate.c
MagickWand/compare.c
MagickWand/composite.c
MagickWand/conjure.c
MagickWand/convert.c
MagickWand/display.c
MagickWand/drawing-wand.c
MagickWand/identify.c
MagickWand/import.c
MagickWand/magick-cli.c
MagickWand/magick-image.c
MagickWand/magick-property.c
MagickWand/magick-wand.c
MagickWand/mogrify.c
MagickWand/montage.c
MagickWand/stream.c
MagickWand/studio.h

index 7af081e158c792f33480ce52e4987dfa56471e05..7ca1fc7d09d851446b256a54e7c75702ed8bb4ed 100644 (file)
@@ -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} 
index 144e8c4db12dcd7eec92319b3a956baff19a069d..772e30ea6fcdbd0af95ba7468de230043b909f7b 100644 (file)
@@ -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++)
index 81ad3b21c5e3db35579aa5a43bdb28df0faf72c6..68c6332cdac9b7a9846f35064bc56c3754f0801d 100644 (file)
@@ -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
index d61fb064b1c78fc643cb880d48fe42f2fbf4c7aa..233edb7411f01208ede29c875361cc77af8e3d78 100644 (file)
@@ -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);
 }
index 89f9abc11f9598fe90b1b82cf34140daf8be8272..0274fd5d0997233da06f65571409c0bdd5ae7ef4 100644 (file)
@@ -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);
index 51fc9a920e70b1be5c0cde33738c65f051e5be73..99d1931bbd6b42030f54b05e1a92970113421bd3 100644 (file)
@@ -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);
index 95fd4d5a3482c227a68ffa4f50530a4797c15f9f..663d0e54a2c932f57c78d7d60a6d0f49efa1140d 100644 (file)
@@ -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);
     }
index ce0bc95b4ea4df119a1b34365c07c860b9f2f693..149df0b1442f4477496d3cd5dfacbc18b138fedb 100644 (file)
@@ -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);
           }
index 5a97d2328edb4174a2e9710064f2a837d897faa5..df953a5c5f6db2976912482507655c00ead47667 100644 (file)
@@ -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.
index a1dff15eaf706ee021059410e3c43b0bff22e759..000fcc70e649bd89628e4adb66e1273d0f1956ea 100644 (file)
@@ -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;
index 3a848ea4348c9c5f46d2b4d929861fb6fc8263fd..279fc8b0efcb71067d7224f178ed8e9f26aac3b6 100644 (file)
@@ -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);
 }
 
index 09dcf9c5d0a44ed55010a08860d2f3f4b5ae1120..fefc1aca1e702068235ef802e8554ebfbbc7d1e8 100644 (file)
@@ -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;
       }
   }
index 3de4ae6e7eebab24ec33630f859db51f879706af..0b099be3042c9fabf8c50d8e8d9188a1dbc4a5d4 100644 (file)
@@ -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
index da3a1ea8aa0cbece0ba499f1baa0039d135facb7..75ca67acd691354eaaf642dfd9ec6d6ce775c66c 100644 (file)
@@ -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);
   }
   /*
index bb464822cdce8a5fcf91d24d44b6ea807f52d756..4cc6d529a8c0a42f8bff23815c4514d0b597d212 100644 (file)
@@ -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
             {
index 3017c23084074220403932bdf9787d8a6b2f9d3c..7753584881c45cbdbc0baf6310834f44c4e29317 100644 (file)
@@ -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;
       }
index 6e22d6903083402d92fdf356f2e747afe83baad7..fafdb01ca84547fe1fc0bbe4019fd3e66bf3651b 100644 (file)
@@ -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);
 }
 \f
@@ -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
index 21008fbb2559cfc6fe7433e542311ad795cc160c..7c6696902d840ecbb078e9e7a6e6157e9aab013a 100644 (file)
@@ -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;
           }
index 0f85e582d5fe5755fe947bee1fa828b07d167ad4..ca2399db09801811fd3630b38d4c4363c4bbfc66 100644 (file)
@@ -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:
 %
index f558eae38ad44f4765178eaee6c8f2e1c50e867c..6376a2b619873dd54d3a26bb580d14b5dd53b23e 100644 (file)
@@ -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; \
index f48a7ee2e2ee0b316e71a85681a62021cd8cd565..39163a31bca85e80330790e433838da6c730f6d3 100644 (file)
@@ -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);
     }
   /*
index 8beebffb4a2fef3979b138ff71d697881196e9c7..139ed4e4976271303512daefa0088198919e2f67 100644 (file)
@@ -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
   {
index 3108551782998e0534e8b3474aba98a29be23ad7..a1fb3b2bcccfc6fab81b9526f4af6af153424677 100644 (file)
@@ -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);
index dba5c33b357d1cf95e55f65d2de8c33d04feaa5a..0a6f4dc57efdaa3d31db615e29376b0735c77265 100644 (file)
@@ -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,
     &region_info->width,&region_info->height);
   if (flags == NoValue)
     (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
-      "InvalidGeometry","`%s'",geometry);
+      "InvalidGeometry","'%s'",geometry);
   return(flags);
 }
 \f
index 6a04abc629fb6a4d7d92776c6975bf842c44513b..beb402e9d539b6f22fe6f5781bba19c3c6148243 100644 (file)
@@ -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;
             }
index 93ae4fe593b0bf3ad341d485a60871848bcec440..5e51c26c68d3ff6c31906b05c80b6dc288f36443 100644 (file)
@@ -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);
 }
 \f
index e87cc13d4df7246d1687df7d444fc60342931de6..d80c2ca1f9899d18e4b669f1eaaba017f9f50a12 100644 (file)
@@ -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);
index 1cd6d5c87ea38f5fe39234a7facc19520d72a742..4240b2414a72e13591281a7bcb13a360c2678a44 100644 (file)
@@ -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);
index 7164f5a5e05eaa41fe2464a4bd0322bcc89b19de..70ac21ae1c16aafae095bfd9a6c65b4f5b65280d 100644 (file)
@@ -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);
index 042ffba29ec6a90a3505da41a280638b32aeabdd..07a7c9f6ba5ab232dd76f75c86cd2323569ce175 100644 (file)
@@ -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.
index cfbfa56c1b2c9b2493ffa36ebbfeaa95f3e683f4..f63573bc8163cfb0148734c76a2369e890afee13 100644 (file)
@@ -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.
index 97f2b9e11978c5711b97a958cb6e45b7c22c71ef..a03672052f30d7f40cf675c52d0213fae78a2f58 100644 (file)
@@ -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))
index 98acf07e6472700ab13802ee2772ab07e1259db3..b03a4fec8f702764e62a8ba1e4b2ec75bab2d374 100644 (file)
@@ -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);
index d76e094ecbc18c118d3a5a8a8fe2b21f1f494efc..7b07864aaea710145b2894411c76c4b0684ccf1b 100644 (file)
@@ -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);
 }
 \f
@@ -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);
 }
 \f
@@ -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);
index b180e667ba51174fbaa6445ae7037b11b44c3fe0..d7cc8bc8a6bd9ff13397ddb8bd07fce8bce3d02a 100644 (file)
@@ -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);
index 9ce40324a5f499202fbf52b6234e1e42cba02c20..89e8140b6e93e4f0d0edd072f13f392ae64bfe74 100644 (file)
@@ -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);
index dc46381d03b85a00c4cdf6ec6826e44efb6de289..e1dcc4b2af9947a9480cdfd4389686f4111a2e4e 100644 (file)
@@ -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;
     }
   }
index 6659e5070b16ba984ffda6d2bcfd73ec1f5bfb77..996296273e40924bb23cff3ac394a3ec5ba0d6aa 100644 (file)
@@ -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.
index ed4ba4ccf526e1f69545bb035cc811837c1f9100..0559f6e3c6d6471a61eedf2416a570f6c31883b6 100644 (file)
@@ -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;
index 2b8b4e88598f1ea20fcf7f11a42485227b5f3b7e..9bd8e57d339378423108a8683132c11fa01512c7 100644 (file)
@@ -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
index 3283b525363627fb27f83c5ac2b1f09f35befbf2..b52dbec179fa4f44e839603f4dc3108661bb94ee 100644 (file)
@@ -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);
index 1b0afda709ead6756aa22c2f063826ca482b71cb..4bd5300eef1a248ee806bd129428ba51efc33e9e 100644 (file)
@@ -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)
index 65efe5437a15e4a7340eceac19d9459d83237214..2c2154e3acd60de046a52f266ab1754ed4ed498c 100644 (file)
@@ -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,
index c2f692b7d0df08c2d2c11161c4ca0d9755ca6529..dc97d71631d9bd7ed20f206e9e50f3f6766742ab 100644 (file)
@@ -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;
index f4eda5c3781520908b1cbe49b0d266c81f846b87..b1dd5fd7b68f4a0a7f4d9696f3839cfb8b974e19 100644 (file)
@@ -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;
index a3b0c6811c298ce20b52e2775480a88c0c3245b6..bbee6bd547f203482cd5711eef64b13f2966b0ba 100644 (file)
 %
 %    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);
         }
       /*
index 488803c21f8a6426d6cac929f415c2d91dff2a8f..7e568b732b0de68f63ac73f470b1dcdc4f839079 100644 (file)
@@ -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;
index 7093dae86c445e439a30dbb2ceb469fadafb2451..265da610484073fd695fe5436e9682411730b9cc 100644 (file)
@@ -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);
index 087cb494a325c7ead5e5f6e0f8db8ee4fc989004..99f194d9a550cd6cbce778bb14534f7096dc6bde 100644 (file)
@@ -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);
     }
   /*
index 7fe25e78febc06752d3350fb8183590f33a74198..cef10b0ae5cca00026097e8091e831d92743dd28 100644 (file)
@@ -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);
index 190b18efd02120e838d3f5299ded1de0f6b53a01..1ee8c2141a24df0b45724318ec59f105a57907a0 100644 (file)
@@ -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);
     }
   /*
index 8e9d26c9923c32af0262e65cd3460c848a9ff0a5..b066c30f2d1850a1df9fb5db3827ce7e081591fe 100644 (file)
@@ -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);
index 57f35b38393e3711027ea09ed55198344aa082a2..0a438058650fa82bbc623fb32a799b1ae7b889e7 100644 (file)
@@ -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++)
index d695547b3a20ef69ca7e228157bf95781e9d7d63..2f1b4a25c99c52e1e35ef3c7cc14504ae6ee415c 100644 (file)
@@ -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);
 }
 \f
index eab3410b1726bad8a07431787b84ec9421c4d1fc..442802837874983bca89ebd717747aa4cba86521 100644 (file)
@@ -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); \
index 49449793757f6f4a75351ae436902509b380b6e3..13be39c9bbe9a413dc78b376b0082b0b6db0afe2 100644 (file)
@@ -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
 }
index 6d4cefbfcb3d81dd3d939dc3d1dfdf31c4b59a9d..7af002587772b811319d77d7a4dcae09039856cf 100644 (file)
@@ -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); \
 }
index b22331fbef87503c2f27bd927fd26cd71e6d3e10..156157bf80c404d248f06653f83fa92f63c5faa6 100644 (file)
@@ -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); \
 }
index 139e49bf2c69585d58fb84bc0bf68aa0bd712fee..bb51ddd8c14cef5e41e4e7bfa07f8035afd9559b 100644 (file)
@@ -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); \
 }
index 016c0ac520128d7527daf4027792f419aa5508d1..4bb8e332ccbb3bca9fcbc88bd80b310c118a1ec0 100644 (file)
@@ -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); \
 }
 \f
@@ -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)
index 427a8a4f26dce0971226b8fe5c93d4cc8ad27354..dfeb76448c01bb6b352699c48cebac9aa8cdc8f8 100644 (file)
@@ -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
 }
index 9a5a14d8ca898e29d175199dbc50c10a7ac1452d..a7d31d957b9e15f9e646779a97f973558ef0c556 100644 (file)
@@ -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);
 \f
 /*
   Typedef declarations.
index a2b4d7b78e15ff37d1f54730caa945dbb4821d04..c6fb6b83ea757868ea56fdcf4c70f8620427cffa 100644 (file)
@@ -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); \
 }
index 078986b1b56b42a8c6c0ce2f7dbd947c3f9c4e56..e38ba65b635d8549b33c3f369c0217b82b607cd2 100644 (file)
@@ -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
 }
index 1d29d9aabd6e6372f1a8758cd6fa5a4fad97009d..a926368d3df04885fc62472e0a9f67bde90569f5 100644 (file)
@@ -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);
index 7bb0b235aa4761af9b9e14231ce0fcc075535cb4..5923ec36e527c34649d52c617083ef1b4dabeafa 100644 (file)
@@ -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);
index baf507696c07ea12808131501f97c2be743cf578..75a6b6ff442eeb2d2744b2b3de41243b3b1c3dae 100644 (file)
@@ -58,7 +58,7 @@
 #define ThrowWandException(severity,tag,context) \
 { \
   (void) ThrowMagickException(wand->exception,GetMagickModule(),severity, \
-    tag,"`%s'",context); \
+    tag,"'%s'",context); \
   return(MagickFalse); \
 }
 \f
@@ -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;
index a7fe86b1092e30f424541b74c8e62debd72663f5..8b8d7a0d15a6f1645b5626355f756b28d15a06a2 100644 (file)
@@ -57,7 +57,7 @@
 #define ThrowWandException(severity,tag,context) \
 { \
   (void) ThrowMagickException(wand->exception,GetMagickModule(),severity, \
-    tag,"`%s'",context); \
+    tag,"'%s'",context); \
   return(MagickFalse); \
 }
 \f
@@ -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));
index 988a30e3b1e2a900c07580ea216756683bf3e01e..3d8005477e6a4e341b5fc04a5b704734ca38771d 100644 (file)
@@ -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;
               }
index 9c8a910633d614d0f902f05e687d0b1d4bd4b0c9..8a321455588c12c4b4c5c70919a40cd82828dd74 100644 (file)
@@ -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); \
 }
index 782b957202e4eaf9ff176f27d6505a27e330a177..da91a8630952fbd3ad50a84a8c23abf6bfd43d02 100644 (file)
@@ -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); \
 }
index e1de6bd0027ec05ef98993f97bbeaed61de6ba66..f5f8ef4d86006e2b3b5cb9f82b9731c1e30f9778 100644 (file)
@@ -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); \
 }