(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 8579632783d1101ce37e4cfa694a5cb7443e59c1..5501adc8d29cd659e1b0e3c6c600e5ffc80707a1 100644 (file)
--- 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 c4510bcdbbe7e6c4a5e62aaecaa039e2e214f528..33a3830a2e540277b27cbc269bad7209024b7104 100644 (file)
--- 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 391017b3fe88a727eca0523bb1f8114f17178ab6..82a0cc8bb763b1bbdefed9946befcf36e4672c1f 100644 (file)
--- 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 9fc8adf89b36b7eb8b914f307e7ac663d0c6d216..6f37d263b7ccb0cc058720dcbeee124a53428921 100755 (executable)
--- 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