(no commit message)

diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c
index 176ca09adf7d76502fcc303f13551821f4894dc6..0c15da9ba90dab4f1d83410f1006b3ff753eebf0 100644 (file)
--- 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 58a53c54c7e6554a294f4aea59653f84bfa01bf7..0db0bf651359799107d2dfa0421e19d7def1830e 100644 (file)
--- 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 997c70f620183036fd8f46c556c1e56e497896ee..c29b1cc3e0f01aa29ffa7d74b3b09f3356ce63c4 100644 (file)
--- 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: