From 6d9f12f1f82f8545fe346ef3a968224e42f5c3dc Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 3 Nov 2009 14:50:26 +0000 Subject: [PATCH] --- ImageMagick.spec | 2 +- coders/tiff.c | 12 ++++++------ config/configure.xml | 4 ++-- libtool | 2 +- magick/version.h | 4 ++-- version.sh | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 3e54414c1..282e8117e 100644 --- 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 3f773833c..454095288 100644 --- 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 d5cdc3063..75a83abc0 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,8 +8,8 @@ - - + + diff --git a/libtool b/libtool index 703a9c9d8..456d3f546 100755 --- 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 dd2f851d0..f2545b4d1 100644 --- 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 6b7b79298..e6f83f668 100644 --- 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" -- 2.50.1