From d002bde6804b2b6772683003a7aa853488f74fd4 Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 4 Mar 2012 03:15:34 +0000
Subject: [PATCH]

---
 MagickCore/version.h | 2 +-
 coders/caption.c     | 9 ++++++---
 config/configure.xml | 2 +-
 configure            | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 857963278..5501adc8d 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "7036"
+#define MagickSVNRevision  "7038"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
diff --git a/coders/caption.c b/coders/caption.c
index c4510bcdb..33a3830a2 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -267,11 +267,14 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
   pango_layout_set_font_description(layout,description);
   pango_font_description_free(description);
   option=GetImageOption(image_info,"filename");
-  if (option != (const char *) NULL) 
-    property=InterpretImageProperties(image_info,image,option,exception);
-  else
+  if (option == (const char *) NULL)
     property=InterpretImageProperties(image_info,image,image_info->filename,
       exception);
+  else
+    if (LocaleNCompare(option,"caption:",8) == 0)
+      property=InterpretImageProperties(image_info,image,option+8,exception);
+    else
+      property=InterpretImageProperties(image_info,image,option,exception);
   (void) SetImageProperty(image,"caption",property,exception);
   property=DestroyString(property);
   caption=ConstantString(GetImageProperty(image,"caption",exception));
diff --git a/config/configure.xml b/config/configure.xml
index 391017b3f..82a0cc8bb 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,7 +10,7 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="7036" />
+  <configure name="SVN_REVISION" value="7038" />
   <configure name="RELEASE_DATE" value="2012-03-03"/>
   <configure name="CONFIGURE" value="./configure  '--enable-maintainer-mode'"/>
   <configure name="PREFIX" value="/usr/local"/>
diff --git a/configure b/configure
index 9fc8adf89..6f37d263b 100755
--- a/configure
+++ b/configure
@@ -3616,7 +3616,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=7036
+MAGICK_SVN_REVISION=7038
 
 
 
-- 
2.40.0