From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 14 Feb 2012 00:45:06 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6183
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c51145efe02a1e4f330b98119b00c21bdae209c4;p=imagemagick

---

diff --git a/coders/tiff.c b/coders/tiff.c
index c29b1cc3e..096349084 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1223,8 +1223,6 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
     if ((photometric != PHOTOMETRIC_SEPARATED) &&
         (interlace == PLANARCONFIG_SEPARATE) && (bits_per_sample < 64))
       method=ReadGenericMethod;
-    if (image->compression == JPEGCompression)
-      method=ReadGenericMethod;
     if (TIFFIsTiled(tiff) != MagickFalse)
       method=ReadTileMethod;
     quantum_info->endian=LSBEndian;
@@ -2767,12 +2765,6 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
         }
       }
 #endif
-    if ((image->colorspace == CMYKColorspace) &&
-        (compress_tag != COMPRESSION_JPEG))
-      {
-        compress_tag=COMPRESSION_NONE;
-        compression=NoCompression;
-      }
     switch (compression)
     {
       case FaxCompression: