(no commit message)

diff --git a/coders/msl.c b/coders/msl.c
index e6687d7031b9c5e83944f0b5f36189146736f14f..edf316a8ea8209a40eb6dfafd5394ff36b85adb4 100644 (file)
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -4807,6 +4807,34 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                 ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
                 break;
               }
+              case 'G':
+              case 'g':
+              {
+                if (LocaleCompare(keyword,"gravity") == 0)
+                  {
+                    option=ParseMagickOption(MagickGravityOptions,MagickFalse,
+                      value);
+                    if (option < 0)
+                      ThrowMSLException(OptionError,"UnrecognizedGravityType",
+                        value);
+                    (void) SetImageOption(msl_info->image_info[n],keyword,
+                      value);
+                    break;
+                  }
+                ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
+                break;
+              }
+              case 'P':
+              case 'p':
+              {
+                if (LocaleCompare(keyword,"pointsize") == 0)
+                  {
+                    msl_info->image_info[n]->pointsize=atof(value);
+                    break;
+                  }
+                ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
+                break;
+              }
               case 'S':
               case 's':
               {
@@ -5468,7 +5496,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
           break;
         }
         if (attributes == (const xmlChar **) NULL)
-        break;
+          break;
         for (i=0; (attributes[i] != (const xmlChar *) NULL); i++)
         {
         keyword=(const char *) attributes[i++];

diff --git a/config/configure.xml b/config/configure.xml
index 71e0c9a56e0ab680f324e74e0c4e6037cf8da5a7..93ff9d31ae1a7cf50f35a86f758c9a53733150c5 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x656"/>
   <configure name="LIB_VERSION_NUMBER" value="6,5,6,0"/>
-  <configure name="RELEASE_DATE" value="2009-09-12"/>
+  <configure name="RELEASE_DATE" value="2009-09-14"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/magick/version.h b/magick/version.h
index fa24b5a72e04024834e2e4e13a5a423bd6e42465..fb6d88682d0d950a2cd793435c7be9169f6707c5 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -31,8 +31,8 @@ extern "C" {
 #define MagickLibVersionText  "6.5.6"
 #define MagickLibVersionNumber  2,0,0
 #define MagickLibSubversion  "-0"
-#define MagickReleaseDate  "2009-09-12"
-#define MagickChangeDate   "20090911"
+#define MagickReleaseDate  "2009-09-14"
+#define MagickChangeDate   "20090913"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.5.6/index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)

diff --git a/tests/validate.h b/tests/validate.h
index a47751104e2c9f0efd603f777a308814e2759660..501854e76c79d77cd1100b4adda12d4626406498 100644 (file)
--- a/tests/validate.h
+++ b/tests/validate.h
@@ -349,7 +349,9 @@ static const struct ReferenceFormats
     { "XPM", 0.0 },
     { "XPS", 0.0 },
     { "XV", 0.0 },
+#if !defined(__WINDOWS__)
     { "XWD", 0.0 },
+#endif
     { "YUV", 0.0 },
     { "YCbCr", 0.0 },
     { "YCbCrA", 0.0 },

diff --git a/version.sh b/version.sh
index 7e83163d6d4bc1fcf2269c498883b8a150e534df..67a1c95d691a45b7863605d8bee9e4d305dffe2d 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick'
 # PACKAGE_NAME (e.g. "1.0.0").
 PACKAGE_VERSION='6.5.6'
 PACKAGE_LIB_VERSION="0x656"
-PACKAGE_RELEASE="1"
+PACKAGE_RELEASE="0"
 PACKAGE_LIB_VERSION_NUMBER="6,5,6,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"