...

diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 332d88d8e1fa81789e677a7e30eb52dc42865208..8292be7236b1c4237c2a0aac15340514b05bcd51 100644 (file)
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -212,8 +212,10 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image,
   artifact=GetImageArtifact(image,"lowlight-color");
   if (artifact != (const char *) NULL)
     (void) QueryColorCompliance(artifact,AllCompliance,&lowlight,exception);
-  masklight=lowlight;
-  masklight.alpha=(MagickRealType) TransparentAlpha;
+  (void) QueryColorCompliance("#ffffff88",AllCompliance,&masklight,exception);
+  artifact=GetImageArtifact(image,"masklight-color");
+  if (artifact != (const char *) NULL)
+    (void) QueryColorCompliance(artifact,AllCompliance,&masklight,exception);
   /*
     Generate difference image.
   */
@@ -264,7 +266,8 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image,
       register ssize_t
         i;
 
-      if (GetPixelReadMask(image,p) == 0)
+      if ((GetPixelReadMask(image,p) == 0) ||
+          (GetPixelReadMask(reconstruct_image,q) == 0))
         {
           SetPixelViaPixelInfo(highlight_image,&masklight,r);
           p+=GetPixelChannels(image);

diff --git a/configure b/configure
index 666833515c9f72344f1d14ad6e672a447e91d928..03acf7fd3a5538640e0828178960b71b964ecf91 100755 (executable)
--- a/configure
+++ b/configure
@@ -4518,7 +4518,7 @@ MAGICK_PATCHLEVEL_VERSION=9
 
 MAGICK_VERSION=7.0.3-9
 
-MAGICK_GIT_REVISION=19068:fdeb2b1:20161125
+MAGICK_GIT_REVISION=19134:0613bb0:20161203
 
 
 # Substitute library versioning

diff --git a/version.sh b/version.sh
index e957405cd4792425566fa7267a5555e93696ec79..3a691d2aad22621bc2b31ae38aadf10872e4020b 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -40,11 +40,11 @@ PACKAGE_VERSION_ADDENDUM="-${PACKAGE_RELEASE}"
 # PLEASE NOTE that doing a SO BUMP aka raising the CURRENT REVISION
 # could be avoided using libversioning aka map files.  You MUST change .map
 # files if you raise these versions.
-MAGICK_LIBRARY_CURRENT=0
+MAGICK_LIBRARY_CURRENT=1
 MAGICK_LIBRARY_REVISION=0
 MAGICK_LIBRARY_AGE=0
 
 # magick++
-MAGICKPP_LIBRARY_CURRENT=0
+MAGICKPP_LIBRARY_CURRENT=1
 MAGICKPP_LIBRARY_REVISION=0
 MAGICKPP_LIBRARY_AGE=0