(no commit message)

diff --git a/coders/tiff.c b/coders/tiff.c
index c29b1cc3e0f01aa29ffa7d74b3b09f3356ce63c4..0963490847648a8e90085099fd5ebaeb2256cd7a 100644 (file)
--- 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: