From 94ca3383fedbcd01a307dd1b6c5e00ef8cd5603a Mon Sep 17 00:00:00 2001 From: Cristy Date: Sat, 3 Dec 2016 18:33:29 -0500 Subject: [PATCH] ... --- MagickCore/compare.c | 9 ++++++--- configure | 2 +- version.sh | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/MagickCore/compare.c b/MagickCore/compare.c index 332d88d8e..8292be723 100644 --- 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 666833515..03acf7fd3 100755 --- 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 e957405cd..3a691d2aa 100644 --- 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 -- 2.40.0