(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 3e54414c1301f3e9be6a7ee3990e369b2aaa6655..282e8117e8f077850ff7bc3f2c09125d852b1e5e 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.5.7
-%define Patchlevel  5
+%define Patchlevel  4
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/coders/tiff.c b/coders/tiff.c
index 3f773833c5ac635440b8744cc2309600241ff01f..4540952887dc73985c3d4421b630549320a43e46 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1300,13 +1300,13 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
         /*
           Convert TIFF image to DirectClass MIFF image.
         */
-        for (y=0; y < (long) image->rows; y++)
+        for (i=0; i < (long) samples_per_pixel; i++)
         {
-          register PixelPacket
-            *__restrict q;
-
-          for (i=0; i < (long) samples_per_pixel; i++)
+          for (y=0; y < (long) image->rows; y++)
           {
+            register PixelPacket
+              *__restrict q;
+
             int
               status;
 
@@ -1326,7 +1326,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
                 case 3: quantum_type=AlphaQuantum; break;
                 default: quantum_type=UndefinedQuantum; break;
               }
-           else
+            else
               switch (i)
               {
                 case 0: quantum_type=CyanQuantum; break;

diff --git a/config/configure.xml b/config/configure.xml
index d5cdc3063e3c019541d68397481c807c986b4228..75a83abc0e3872593c9e2ba9748007c022c29dfb 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -8,8 +8,8 @@
 <configuremap>
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x657"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,5,7,5"/>
-  <configure name="RELEASE_DATE" value="2009-11-02"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,5,7,4"/>
+  <configure name="RELEASE_DATE" value="2009-11-03"/>
   <configure name="CONFIGURE" value="./configure  'CC=gcc -std=gnu99'"/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index 703a9c9d825acb336710301b318f9ba41aaef184..456d3f546353735486d262b7c6c07db32cf3d888 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.5.7-5
+# Generated automatically by config.status (ImageMagick) 6.5.7-4
 # 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 dd2f851d0b5a1b6261c3df13297db10faaa7d71c..f2545b4d1d7291d938f04c10dc316fc510b6d556 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,8 +30,8 @@ extern "C" {
 #define MagickLibVersion  0x657
 #define MagickLibVersionText  "6.5.7"
 #define MagickLibVersionNumber  2,0,0
-#define MagickLibSubversion  "-5"
-#define MagickReleaseDate  "2009-11-02"
+#define MagickLibSubversion  "-4"
+#define MagickReleaseDate  "2009-11-03"
 #define MagickChangeDate   "20091101"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.5.7/index.html"

diff --git a/version.sh b/version.sh
index 6b7b79298c3b8b012c1f63675595e2c6137d876e..e6f83f66898e9e19bf6d7cb2f097f471470e53f0 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.7'
 PACKAGE_LIB_VERSION="0x657"
-PACKAGE_RELEASE="5"
+PACKAGE_RELEASE="4"
 PACKAGE_LIB_VERSION_NUMBER="6,5,7,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"