...

diff --git a/Install-mac.txt b/Install-mac.txt
index 7dbf824458ba966ed37ed4af0349ffda44cd5fd9..926752d589b9d110047cc7fa469cfef87733206b 100644 (file)
--- 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 808541af4a87345bba525b85ecf6d28aa56c2fbe..4a51d0888796dd4156c18e572203048fa18fdc07 100644 (file)
--- 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 c3ead4784dc308d0d2f73d1cef523155dc3d5d2a..2916b47074924d63187b852d6f9c10c9b7e25fed 100644 (file)
--- 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);