From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 30 Jan 2012 01:40:35 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6299
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=183a5c7d1c8a9a747766ff9a2ef067853a7066e9;p=imagemagick

---

diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h
index 92fc0f069..58bebe83e 100644
--- a/MagickCore/cache-private.h
+++ b/MagickCore/cache-private.h
@@ -120,7 +120,7 @@ typedef struct _CacheInfo
 
   MagickBooleanType
     matte,
-    masky;
+    mask;
 
   size_t
     columns,
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 60008442e..7cf4b6513 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -1835,7 +1835,7 @@ static inline MagickBooleanType ValidatePixelCacheMorphology(const Image *image)
   if ((image->storage_class != cache_info->storage_class) ||
       (image->colorspace != cache_info->colorspace) ||
       (image->matte != cache_info->matte) ||
-      (image->masky != cache_info->masky) ||
+      (image->mask != cache_info->mask) ||
       (image->columns != cache_info->columns) ||
       (image->rows != cache_info->rows) ||
       (image->number_channels != cache_info->number_channels) ||
@@ -3753,7 +3753,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
   cache_info->storage_class=image->storage_class;
   cache_info->colorspace=image->colorspace;
   cache_info->matte=image->matte;
-  cache_info->masky=image->masky;
+  cache_info->mask=image->mask;
   cache_info->rows=image->rows;
   cache_info->columns=image->columns;
   InitializePixelChannelMap(image);
diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index f431d0e31..df92359d6 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -2246,7 +2246,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
                 if (graphic_context[n]->clip_mask != (char *) NULL)
                   if (LocaleCompare(graphic_context[n]->clip_mask,
                       graphic_context[n-1]->clip_mask) != 0)
-                    image->masky=MagickFalse;
+                    SetImageMask(image,(Image *) NULL,exception);
                 graphic_context[n]=DestroyDrawInfo(graphic_context[n]);
                 n--;
                 break;
diff --git a/MagickCore/image.c b/MagickCore/image.c
index eaa7b807a..27521ab18 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -803,7 +803,7 @@ MagickExport Image *CloneImage(const Image *image,const size_t columns,
   clone_image->number_meta_channels=image->number_meta_channels;
   clone_image->metacontent_extent=image->metacontent_extent;
   clone_image->colorspace=image->colorspace;
-  clone_image->masky=image->masky;
+  clone_image->mask=image->mask;
   clone_image->matte=image->matte;
   clone_image->columns=image->columns;
   clone_image->rows=image->rows;
@@ -1464,7 +1464,7 @@ MagickExport Image *GetImageMask(const Image *image,ExceptionInfo *exception)
     return((Image *) NULL);
   status=MagickTrue;
   mask_image->colorspace=GRAYColorspace;
-  mask_image->masky=MagickFalse;
+  mask_image->mask=MagickFalse;
   image_view=AcquireCacheView(image);
   mask_view=AcquireCacheView(mask_image);
   for (y=0; y < (ssize_t) image->rows; y++)
@@ -3353,13 +3353,13 @@ MagickExport MagickBooleanType SetImageMask(Image *image,const Image *mask,
   assert(image->signature == MagickSignature);
   if (mask == (const Image *) NULL)
     {
-      image->masky=MagickFalse;
+      image->mask=MagickFalse;
       return(MagickTrue);
     }
   if ((mask->columns != image->columns) || (mask->rows != image->rows))
     ThrowBinaryException(ImageError,"ImageSizeDiffers",image->filename);
   status=MagickTrue;
-  image->masky=MagickTrue;
+  image->mask=MagickTrue;
   image_view=AcquireCacheView(image);
   mask_view=AcquireCacheView(mask);
   for (y=0; y < (ssize_t) image->rows; y++)
diff --git a/MagickCore/image.h b/MagickCore/image.h
index 6d4f8019a..6e505d002 100644
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -273,7 +273,7 @@ struct _Image
     ping;
 
   MagickBooleanType
-    masky;
+    mask;
 
   size_t
     number_channels,
diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 6b99c6b73..73a5f903c 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -3922,7 +3922,7 @@ MagickExport void InitializePixelChannelMap(Image *image)
     SetPixelChannelMap(image,AlphaPixelChannel,CopyPixelTrait,n++);
   if (image->storage_class == PseudoClass)
     SetPixelChannelMap(image,IndexPixelChannel,CopyPixelTrait,n++);
-  if (image->masky != MagickFalse)
+  if (image->mask != MagickFalse)
     SetPixelChannelMap(image,MaskPixelChannel,CopyPixelTrait,n++);
   assert((n+image->number_meta_channels) < MaxPixelChannels);
   for (i=0; i < (ssize_t) image->number_meta_channels; i++)
@@ -5668,7 +5668,7 @@ MagickExport void SetPixelChannelMapMask(Image *image,
   }
   if (image->storage_class == PseudoClass)
     SetPixelChannelMapTraits(image,IndexPixelChannel,CopyPixelTrait);
-  if (image->masky != MagickFalse)
+  if (image->mask != MagickFalse)
     SetPixelChannelMapTraits(image,MaskPixelChannel,CopyPixelTrait);
   if (image->debug != MagickFalse)
     LogPixelChannels(image);
diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 76737498e..b00d7c09f 100644
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -4440,7 +4440,7 @@ Get(ref,...)
                     *sv;
 
                   sv=NULL;
-                  if (image->masky == MagickFalse)
+                  if (image->mask == MagickFalse)
                     ClipImage(image,exception);
                   mask_image=GetImageMask(image,exception);
                   if (mask_image != (Image *) NULL)
@@ -4463,7 +4463,7 @@ Get(ref,...)
                     *sv;
 
                   sv=NULL;
-                  if (image->masky != MagickFalse)
+                  if (image->mask != MagickFalse)
                     ClipImage(image,exception);
                   mask_image=GetImageMask(image,exception);
                   if (mask_image != (Image *) NULL)
diff --git a/coders/clip.c b/coders/clip.c
index 3e779f3b0..b5e1631a0 100644
--- a/coders/clip.c
+++ b/coders/clip.c
@@ -160,9 +160,9 @@ static MagickBooleanType WriteCLIPImage(const ImageInfo *image_info,
   MagickBooleanType
     status;
 
-  if (image->masky == MagickFalse)
+  if (image->mask == MagickFalse)
     (void) ClipImage(image,exception);
-  if (image->masky == MagickFalse)
+  if (image->mask == MagickFalse)
     ThrowWriterException(CoderError,"ImageDoesNotHaveAClipMask");
   clip_image=GetImageMask(image,exception);
   if (clip_image == (Image *) NULL)
diff --git a/coders/ps3.c b/coders/ps3.c
index 81badfdce..f82034a69 100644
--- a/coders/ps3.c
+++ b/coders/ps3.c
@@ -1125,7 +1125,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image,
     /*
       PS clipping path from Photoshop clipping path.
     */
-    if ((image->masky != MagickFalse) ||
+    if ((image->mask != MagickFalse) ||
         (LocaleNCompare("8BIM:",image->magick_filename,5) != 0))
       (void) WriteBlobString(image,"/ClipImage {} def\n");
     else
@@ -1201,7 +1201,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image,
     /*
       Photoshop clipping path active?
     */
-    if ((image->masky != MagickFalse) &&
+    if ((image->mask != MagickFalse) &&
         (LocaleNCompare("8BIM:",image->magick_filename,5) == 0))
         (void) WriteBlobString(image,"true\n");
       else