https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31855

diff --git a/ChangeLog b/ChangeLog
index d4a335e5108f8f2a4ed2d90ecc60bf49318c215a..c59b10bea9d660a82c0aa91fa7a2d0efaa202265 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
     https://github.com/ImageMagick/ImageMagick/issues/463).
   * The +opaque option now works on all channels (reference
     https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31862).
+  * Ensure backwards compatibility for the -combine option (reference
+    https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31855).
 
 2017-04-24  7.0.5-5 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.5-5, GIT revision 19915:12eec43:20170424.

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 770b5e9c9a3b6e83e5c6fa4f937fcc2c68b0875c..d26589c118b095ee97bdd8b856046ecd02ab8f37 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -7820,6 +7820,8 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
 
             (void) SyncImagesSettings(mogrify_info,*images,exception);
             colorspace=(*images)->colorspace;
+            if ((*images)->number_channels < GetImageListLength(*images))
+              colorspace=sRGBColorspace;
             if (*option == '+')
               colorspace=(ColorspaceType) ParseCommandOption(
                 MagickColorspaceOptions,MagickFalse,argv[i+1]);

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 8d8e63c137c09cce71d2375ae880cbb80e949dc7..6baf672e67293c881e071037e41522de833f9643 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -3824,6 +3824,8 @@ WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand,
       if (LocaleCompare("combine",option+1) == 0)
         {
           parse=(ssize_t) _images->colorspace;
+          if (_images->number_channels < GetImageListLength(_images))
+            parse=sRGBColorspace;
           if ( IfPlusOp )
             parse=ParseCommandOption(MagickColorspaceOptions,MagickFalse,arg1);
           if (parse < 0)

diff --git a/configure b/configure
index 5b5c9873f748fcd9e92ad67cd7556eddf3450868..3a0075c404ee158264817c4075c356351916f835 100755 (executable)
--- a/configure
+++ b/configure
@@ -4519,7 +4519,7 @@ MAGICK_PATCHLEVEL_VERSION=6
 
 MAGICK_VERSION=7.0.5-6
 
-MAGICK_GIT_REVISION=19916:f1208a9:20170425
+MAGICK_GIT_REVISION=20022:5239ac0:20170509
 
 
 # Substitute library versioning