From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 13 Feb 2012 20:55:37 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6184
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5754bd6b13ccd1e2b9728deca05fa3fac331728;p=imagemagick

---

diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c
index 176ca09ad..0c15da9ba 100644
--- a/MagickWand/magick-cli.c
+++ b/MagickWand/magick-cli.c
@@ -232,7 +232,7 @@ WandExport void MagickCommandProcessOptions(MagickWand *wand,int argc,
 #if MagickCommandDebug
       (void) FormatLocaleFile(stderr,
           "CLI Option: \"%s\" \tCount: %d  Flags: %04x Args: \"%s\" \"%s\"\n",
-          option,count,flags,arg1,arg2);
+          option,(int) count,flags,arg1,arg2);
 #endif
 
       if ( (flags & SpecialOptionFlag) != 0 )
diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 58a53c54c..0db0bf651 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -3305,6 +3305,7 @@ WandExport void WandSimpleOperatorImages(MagickWand *wand,
 
   i=0;
   n=GetImageListLength(wand->images);
+  (void) n;
   wand->images=GetFirstImageInList(wand->images);
   for ( ; ; )
   {
diff --git a/coders/tiff.c b/coders/tiff.c
index 997c70f62..c29b1cc3e 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -2767,6 +2767,12 @@ 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: