(no commit message)

[imagemagick] / MagickWand / magick-wand.c

diff --git a/MagickWand/magick-wand.c b/MagickWand/magick-wand.c
index dc91a5cd72275a7205b16dbbcd972c1ca1c2a02f..8b8d7a0d15a6f1645b5626355f756b28d15a06a2 100644 (file)
--- a/MagickWand/magick-wand.c
+++ b/MagickWand/magick-wand.c
@@ -57,7 +57,7 @@
 #define ThrowWandException(severity,tag,context) \
 { \
   (void) ThrowMagickException(wand->exception,GetMagickModule(),severity, \
-    tag,"`%s'",context); \
+    tag,"'%s'",context); \
   return(MagickFalse); \
 }
 \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));
@@ -904,7 +904,7 @@ WandExport void MagickSetFirstIterator(MagickWand *wand)
 %  -1 being the last image in the wand.
 %
 %  If the index is invalid (range too large for number of images in wand)
-%  the function will return magickFalse, but no 'exception' will be raised,
+%  the function will return MagickFalse, but no 'exception' will be raised,
 %  as it is not actually an error.  In that case the current image will not
 %  change.
 %
@@ -941,10 +941,7 @@ WandExport MagickBooleanType MagickSetIteratorIndex(MagickWand *wand,
     return(MagickFalse);
   image=GetImageFromList(wand->images,index);
   if (image == (Image *) NULL)
-    {
-      InheritException(wand->exception,&wand->images->exception);
-      return(MagickFalse);
-    }
+    return(MagickFalse);    /* this is not an exception! Just range error. */
   wand->images=image;
   wand->insert_before=MagickFalse;  /* Insert/Add after (this) image */
   wand->image_pending=MagickFalse;  /* NextImage will set next image */