From 3607cc2b96afe8f9c6eca1641e73707333e5f7b2 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 11 Dec 2016 17:42:56 -0500 Subject: [PATCH] ... --- Install-mac.txt | 4 ++-- Install-unix.txt | 2 +- MagickCore/composite.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Install-mac.txt b/Install-mac.txt index 7dbf82445..926752d58 100644 --- a/Install-mac.txt +++ b/Install-mac.txt @@ -75,8 +75,8 @@ against its message digest. Unpack and change into the top-level ImageMagick directory: - $magick> tar xvfz ImageMagick-7.0.3-0.tar.gz - $magick> cd ImageMagick-7.0.3 + $magick> tar xvfz ImageMagick-7.0.4-0.tar.gz + $magick> cd ImageMagick-7.0.4 Configure ImageMagick: diff --git a/Install-unix.txt b/Install-unix.txt index 808541af4..4a51d0888 100644 --- a/Install-unix.txt +++ b/Install-unix.txt @@ -23,7 +23,7 @@ Configure default options, and build from within the source directory, you can simply type: - $magick> cd ImageMagick-7.0.3 + $magick> cd ImageMagick-7.0.4 $magick> ./configure Watch the configure script output to verify that it finds everything that diff --git a/MagickCore/composite.c b/MagickCore/composite.c index c3ead4784..2916b4707 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -433,7 +433,7 @@ static MagickBooleanType CompositeOverImage(Image *image, Sa: normalized source alpha. Da: normalized canvas alpha. */ - if (GetPixelWriteMask(source_image,p) == 0) + if (GetPixelReadMask(source_image,p) == 0) { p+=GetPixelChannels(source_image); channels=GetPixelChannels(source_image); @@ -635,7 +635,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, register ssize_t i; - if (GetPixelWriteMask(source_image,p) == 0) + if (GetPixelReadMask(source_image,p) == 0) { p+=GetPixelChannels(source_image); q+=GetPixelChannels(image); @@ -721,7 +721,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, } for (x=0; x < (ssize_t) source_image->columns; x++) { - if (GetPixelWriteMask(source_image,p) == 0) + if (GetPixelReadMask(source_image,p) == 0) { p+=GetPixelChannels(source_image); q+=GetPixelChannels(image); -- 2.40.0