From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 21 Nov 2015 02:11:22 +0000 (-0500)
Subject: The -clip option no longer returns an inverted mask
X-Git-Tag: 7.0.1-0~478
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0596ce2f1d9bec7542e255838ec5e785aaf10d15;p=imagemagick

The -clip option no longer returns an inverted mask
---

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 1f6d36c1d..760d13637 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -1448,9 +1448,9 @@ MagickExport Image *GetImageMask(const Image *image,ExceptionInfo *exception)
   if (mask_image == (Image *) NULL)
     return((Image *) NULL);
   status=MagickTrue;
-  mask_image->read_mask=MagickFalse;
   mask_image->alpha_trait=UndefinedPixelTrait;
   (void) SetImageColorspace(mask_image,GRAYColorspace,exception);
+  mask_image->read_mask=MagickFalse;
   image_view=AcquireVirtualCacheView(image,exception);
   mask_view=AcquireAuthenticCacheView(mask_image,exception);
   for (y=0; y < (ssize_t) image->rows; y++)
@@ -2976,16 +2976,20 @@ MagickExport MagickBooleanType SetImageMask(Image *image,const PixelMask type,
       }
     for (x=0; x < (ssize_t) image->columns; x++)
     {
+      MagickRealType
+        intensity;
+
+      intensity=GetPixelIntensity(mask,p);
       switch (type)
       {
         case WritePixelMask:
         {
-          SetPixelWriteMask(image,ClampToQuantum(GetPixelIntensity(mask,p)),q);
+          SetPixelWriteMask(image,ClampToQuantum(QuantumRange-intensity),q);
           break;
         }
         default:
         {
-          SetPixelReadMask(image,ClampToQuantum(GetPixelIntensity(mask,p)),q);
+          SetPixelReadMask(image,ClampToQuantum(QuantumRange-intensity),q);
           break;
         }
       }