From: anthony <anthony@git.imagemagick.org>
Date: Wed, 15 Feb 2012 14:54:59 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6176
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32d85bf842eeb5ad03503c8fc85111be77787c5b;p=imagemagick

---

diff --git a/MagickCore/option.h b/MagickCore/option.h
index 8d8894744..f7b36f10b 100644
--- 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 983238bba..a3d6c7315 100644
--- 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 a9cb15c9b..b3441ec1c 100644
--- 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();