Changeset 7043

Timestamp:

03/03/12 22:15:34 (15 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• MagickCore/version.h (modified) (1 diff)
• coders/caption.c (modified) (1 diff)
• config/configure.xml (modified) (1 diff)
• configure (modified) (1 diff)

ImageMagick/trunk/MagickCore/version.h

@@ -28 +28 @@
 #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"

ImageMagick/trunk/coders/caption.c

@@ -268 +268 @@
   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);

ImageMagick/trunk/config/configure.xml

@@ -11 +11 @@
   <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'"/>

ImageMagick/trunk/configure

@@ -3617 +3617 @@
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=7036
+MAGICK_SVN_REVISION=7038