(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index cbed0169114520bfde767163be0edb0a0054c855..cd83a69d3e26f37f168e0c2f0f5b03134b65c977 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %global VERSION  6.6.4
-%global Patchlevel  3
+%global Patchlevel  2
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/coders/tiff.c b/coders/tiff.c
index 8d82b02e78cf243c1be46f3a054c6a8f5ef47d05..3297841e18528253fb5d50213cdc32697d21c6d7 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1141,6 +1141,8 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
     if ((photometric != PHOTOMETRIC_SEPARATED) &&
         (interlace == PLANARCONFIG_SEPARATE))
       method=ReadGenericMethod;
+    if (image->compression == JPEGCompression)
+      method=ReadGenericMethod;
     if (TIFFIsTiled(tiff) != MagickFalse)
       method=ReadTileMethod;
     quantum_type=RGBQuantum;

diff --git a/config/configure.xml b/config/configure.xml
index 8ea7357d0a39556d6e12a95f554735c46836777a..a848a5e09b48eb4bda77fc34ed226147307ad50a 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -8,7 +8,7 @@
 <configuremap>
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x664"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,4,3"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,4,2"/>
   <configure name="RELEASE_DATE" value="2010-09-15"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index c831f795c2da639b238c20cfc7abb29497227093..7935a1d5e7d35655a2b43a40489e71c2973f14e0 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.4-3
+# Generated automatically by config.status (ImageMagick) 6.6.4-2
 # 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 00f5b8c8ec2bedc7c7e47b5762e752bed7a906cf..5fff0b01c88a19678481c56c5daabab8b96a0da3 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x664
 #define MagickLibVersionText  "6.6.4"
 #define MagickLibVersionNumber  4,0,0
-#define MagickLibAddendum  "-3"
+#define MagickLibAddendum  "-2"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
 #define MagickReleaseDate  "2010-09-15"

diff --git a/version.sh b/version.sh
index a1535b98f54c0e2c72fbac1b0036500269fb36f1..12510e72bebd4734c20b91b8d4aa98113ee2f97d 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.4'
 PACKAGE_LIB_VERSION="0x664"
-PACKAGE_RELEASE="3"
+PACKAGE_RELEASE="2"
 PACKAGE_LIB_VERSION_NUMBER="6,6,4,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"