(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 7b296ecd1248f66de1bea60878f09141b492b15a..7dd9af8d28f70a66867b3c92821a9809be3769f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-09  6.6.8-2 Cristy  <quetzlzacatenango@image...>
+  * Support the Radiance HDR image format.
+  * Update the offset in the black channel when sharpening to avoid incorrect
+    results.
+  * Do not use GenericReadMethod for TIFF images with 64-bits per sample.
+
 2011-03-06  6.6.8-2 Glenn Randers-Pehrson <glennrp@image...>
   * Throw error message when the requested color-type or bit-depth
     cannot be written by the PNG encoder (error was being thrown
@@ -9,11 +15,6 @@
   * Ignore any PNG text chunk with a "density" keyword found by the PNG
     decoder, if the PNG datastream also contains a pHYs chunk.
 
-2011-03-06  6.6.8-2 Cristy  <quetzlzacatenango@image...>
-  * Support the Radiance HDR image format.
-  * Update the offset in the black channel when sharpening to avoid incorrect
-    results.
-
 2011-03-06  6.6.8-1 Cristy  <quetzlzacatenango@image...>
   * New version 6.6.8-1.
 

diff --git a/coders/tiff.c b/coders/tiff.c
index 0aafdc0f7c4afc7484610d814735d6c703a0eda9..18a408cbfe73f32cd532c0a31847f7539e6d60c8 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1152,7 +1152,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
         (photometric == PHOTOMETRIC_MINISWHITE))
       method=ReadSingleSampleMethod;
     if ((photometric != PHOTOMETRIC_SEPARATED) &&
-        (interlace == PLANARCONFIG_SEPARATE))
+        (interlace == PLANARCONFIG_SEPARATE) && (bits_per_sample < 64))
       method=ReadGenericMethod;
     if (image->compression == JPEGCompression)
       method=ReadGenericMethod;