(no commit message)

diff --git a/MagickCore/option.h b/MagickCore/option.h
index 8d88947446f3dbe137272006a71212691aee7260..f7b36f10bf56dca8a7d4d1ffdca812b022c369a6 100644 (file)
--- a/MagickCore/option.h
+++ b/MagickCore/option.h
@@ -180,6 +180,9 @@ extern MagickExport void
   ResetImageOptions(const ImageInfo *),
   ResetImageOptionIterator(const ImageInfo *);
 
+extern MagickExport const OptionInfo
+  *GetCommandOptionInfo(const char *value);
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickWand/convert.c b/MagickWand/convert.c
index 983238bba24e9cb5c5db7bb6f8bb6e25eebd3987..a3d6c73154b610feea05e86899426ed73403727e 100644 (file)
--- a/MagickWand/convert.c
+++ b/MagickWand/convert.c
@@ -927,6 +927,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             clone_images=image;
             if (k != 0)
               clone_images=image_stack[k-1].image;
+            /* FUTURE: Change error report to something more meaningful */
             if (clone_images == (Image *) NULL)
               ThrowConvertException(ImageError,"ImageSequenceRequired",option);
             FireImageStack(MagickTrue,MagickTrue,MagickTrue);

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index a9cb15c9b42b0163bce06c89d1ff3beeb31650dd..b3441ec1c040e3a5cee60a642d95a6c9c854ce3c 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -348,8 +348,8 @@ static inline Image *GetImageCache(const ImageInfo *image_info,const char *path,
     *read_info;
 
   /*
-    Read an image into a image cache if not already present.  Return the image
-    that is in the cache under that filename.
+    Read an image into a image cache (for repeated usage) if not already in
+    cache.  Then return the image that is in the cache.
   */
   (void) FormatLocaleString(key,MaxTextExtent,"cache:%s",path);
   sans_exception=AcquireExceptionInfo();