(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 53dfb9fa0f5ebe2579de2c374539f82219722d8b..67d75570513d9e507a9dfcb303c703ac1a57cfbb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-13  6.6.3-6 Cristy  <quetzlzacatenango@image...>
+  * The AdobeRgb.tif TIFF image no longer faults under Windows (reference
+    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16838).
+
 2010-08-12  6.6.3-5 Cristy  <quetzlzacatenango@image...>
   * The -fx 2e+6/1e+5 argument no longer returns the wrong results (reference
     http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16833).

diff --git a/coders/tiff.c b/coders/tiff.c
index bb8ed46ea62ae882fa34f98c91a238b2a8560583..b60b09b7a27b8e264f9b874ca320637261c8fbd4 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1138,6 +1138,9 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
     if ((photometric == PHOTOMETRIC_MINISBLACK) ||
         (photometric == PHOTOMETRIC_MINISWHITE))
       method=ReadSingleSampleMethod;
+    if ((photometric == PHOTOMETRIC_RGB) &&
+        (bits_per_sample <= 8))
+      method=ReadGenericMethod;
     if ((photometric != PHOTOMETRIC_SEPARATED) &&
         (interlace == PLANARCONFIG_SEPARATE))
       method=ReadGenericMethod;