(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 2949c45d7d3f6ebf3429cd02622f1a1b166debf9..f1851fe16aa3b62f4b6b13af5f06c387d0e7ec33 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "5778"
+#define MagickSVNRevision  "5802"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2011-10-28"
+#define MagickReleaseDate  "2011-10-29"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/coders/pango.c b/coders/pango.c
index faa8bfb4c085b4140868ad5635dd0d85a1623556..362577453a7e8f4fe5e71534506ee6fff0e653ca 100644 (file)
--- a/coders/pango.c
+++ b/coders/pango.c
@@ -65,6 +65,7 @@
 #if defined(MAGICKCORE_PANGOFT2_DELEGATE)
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
+#include <pango/pango-features.h>
 #endif
 \f
 #if defined(MAGICKCORE_PANGOFT2_DELEGATE)
@@ -407,14 +408,24 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
 */
 ModuleExport size_t RegisterPANGOImage(void)
 {
+  char
+    version[MaxTextExtent];
+
   MagickInfo
     *entry;
 
+  *version='\0';
+#if defined(PANGO_VERSION_STRING)
+  (void) FormatLocaleString(version,MaxTextExtent,"(Pangoft2 %s)",
+    PANGO_VERSION_STRING);
+#endif
   entry=SetMagickInfo("PANGO");
 #if defined(MAGICKCORE_PANGOFT2_DELEGATE)
   entry->decoder=(DecodeImageHandler *) ReadPANGOImage;
 #endif
   entry->description=ConstantString("Pango Markup Language");
+  if (*version != '\0')
+    entry->version=ConstantString(version);
   entry->adjoin=MagickFalse;
   entry->module=ConstantString("PANGO");
   (void) RegisterMagickInfo(entry);

diff --git a/config/configure.xml b/config/configure.xml
index 3ee62726178f6f5101f9dac0deebba1d37530e49..bfd33a75e417ba564e45da620378443424f44ed1 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,18 +10,17 @@
   <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="5778" />
-  <configure name="RELEASE_DATE" value="2011-10-28"/>
+  <configure name="SVN_REVISION" value="5802" />
+  <configure name="RELEASE_DATE" value="2011-10-29"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
+  <configure name="INCLUDE_PATH" value="/usr/local/include/ImageMagick"/>
   <configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick/"/>
   <configure name="SHARE_PATH" value="/usr/local/share/ImageMagick-7.0.0"/>
   <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick/"/>
   <configure name="EXECUTABLE_PATH" value="/usr/local/bin"/>
   <configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-7.0.0"/>
-  <configure name="INCLUDEDIR_ARCH" value="/usr/local/include"/>
-  <configure name="CONFIGDIR_ARCH" value="@CONFIGDIR_ARCH@"/>
   <configure name="CODER_PATH" value="/usr/local/lib/ImageMagick-7.0.0/modules-Q16/coders"/>
   <configure name="FILTER_PATH" value="/usr/local/lib/ImageMagick-7.0.0/modules-Q16/filters"/>
   <configure name="CC" value="gcc -std=gnu99 -std=gnu99"/>