(no commit message)

diff --git a/MagickCore/image.c b/MagickCore/image.c
index b0989f3e616115b9d9a3ad516cb689c6d47a313c..cb418ca46c41c364963b8f02a4f7fc7a0fe2623d 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -807,7 +807,7 @@ MagickExport Image *CloneImage(const Image *image,const size_t columns,
   clone_image->magick_rows=image->magick_rows;
   clone_image->type=image->type;
   clone_image->sync=image->sync;
-  clone_image->mask=image->mask;
+  clone_image->channel_mask=image->channel_mask;
   clone_image->channel_map=ClonePixelChannelMap(image->channel_map);
   (void) CopyMagickString(clone_image->magick_filename,image->magick_filename,
     MaxTextExtent);

diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index 129c5c85218944440524055781abf6e3586f9435..c47efff03c426532c1c1dfbb1bee64968ddb7645 100644 (file)
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -262,8 +262,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
                 exception);
               q=GetCacheViewAuthenticPixels(floodplane_view,x,y,
                 image->columns-x,1,exception);
-              if ((p == (const Quantum *) NULL) ||
-                  (q == (Quantum *) NULL))
+              if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
                 break;
               for ( ; x < (ssize_t) image->columns; x++)
               {
@@ -292,8 +291,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
             exception);
           q=GetCacheViewAuthenticPixels(floodplane_view,x,y,(size_t) (x2-x+1),1,
             exception);
-          if ((p == (const Quantum *) NULL) ||
-              (q == (Quantum *) NULL))
+          if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
             break;
           for ( ; x <= x2; x++)
           {