(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 2479ec02a4c358afc7053fb65d831e12472f79da..a3e8a79f54c898ddfc648f6b13ac10a2c8d0bc08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-04-24  6.6.9-6 Cristy  <quetzlzacatenango@image...>
+  * New version 6.6.9-6.
+
 2011-04-21  6.6.9-6 Anthony Thyssen <A.Thyssen@griffith...>
   * Make filter:blur define a multiplicative adjustment of filter settings
     rather than a complete override of those settings.

diff --git a/ImageMagick.spec b/ImageMagick.spec
index f4aad1ed4920b9201b3eaf7544a3ca787ad9ab17..aca3344be7a0408aa7baff215ac2aa1f81d36eae 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %global VERSION  6.6.9
-%global Patchlevel  7
+%global Patchlevel  6
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/coders/xtrn.c b/coders/xtrn.c
index 6c0d5f7b04d7ba180eabd9644d4a3e72dfd5d87d..dab0948cdb861eb5d9f8728e7acf86803f910a46 100644 (file)
--- a/coders/xtrn.c
+++ b/coders/xtrn.c
@@ -482,7 +482,7 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image
         filename[MaxTextExtent];
 
       size_t
-        *blob_length;
+        blob_length;
 
       unsigned char
         *blob_data;
@@ -505,7 +505,7 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image
           blob_data=ImageToBlob(clone_info,image,&blob_length,
             &image->exception);
           if (blob_data == (unsigned char *) NULL)
-            status=False;
+            status=MagickFalse;
           else
             SafeArrayFifo(image,blob_data,blob_length);
           if (status == MagickFalse)

diff --git a/config/configure.xml b/config/configure.xml
index 282c5a16cea413d1c688327ab62e1acf02e4f31a..b74918b101478cbbd1f8bd46b5502f450c76e2d0 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="VERSION" value="6.6.9"/>
   <configure name="LIB_VERSION" value="0x669"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,9,7"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,9,6"/>
   <configure name="SVN_REVISION" value="4226" />
   <configure name="RELEASE_DATE" value="2011-04-24"/>
   <configure name="CONFIGURE" value="./configure "/>

diff --git a/libtool b/libtool
index 7b4dd920df12b80b52b0f72ad2a5da9e5ee8c79d..94276c64bfead34fba42c645535e3626489185da 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ImageMagick) 6.6.9-7
+# Generated automatically by config.status (ImageMagick) 6.6.9-6
 # Libtool was configured on host magick.imagemagick.org:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #

diff --git a/magick/version.h b/magick/version.h
index 8f4e247fb21ef84555ca68027b63cca9d0dea131..7467464386cdadd6d34143522900ee1606d861c7 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -31,11 +31,11 @@ extern "C" {
 #define MagickLibVersion  0x669
 #define MagickLibVersionText  "6.6.9"
 #define MagickLibVersionNumber  4,0,1
-#define MagickLibAddendum  "-7"
+#define MagickLibAddendum  "-6"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
 #define MagickReleaseDate  "2011-04-24"
-#define MagickChangeDate   "20110421"
+#define MagickChangeDate   "20110424"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "

diff --git a/version.sh b/version.sh
index a6c6cfd7101338315d6bff76a4b8b289dc5cec07..57197d01b16346bcbce4176eb0192bef5db58282 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.6.9'
 PACKAGE_LIB_VERSION="0x669"
-PACKAGE_RELEASE="7"
+PACKAGE_RELEASE="6"
 PACKAGE_LIB_VERSION_NUMBER="6,6,9,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"