]> granicus.if.org Git - imagemagick/commitdiff
https://github.com/ImageMagick/ImageMagick/issues/1241
authorCristy <urban-warrior@imagemagick.org>
Mon, 6 Aug 2018 22:33:45 +0000 (18:33 -0400)
committerCristy <urban-warrior@imagemagick.org>
Mon, 6 Aug 2018 22:33:45 +0000 (18:33 -0400)
MagickCore/fx.c
MagickCore/image.c

index 75b2b98c16fdfaac8031cbb85c9b159bef698b30..3bdc468273872ba421a49912e207d9c143dd6389 100644 (file)
@@ -3394,7 +3394,7 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount,
       delta.x=scale.x*(double) (x-center.x);
       distance=delta.x*delta.x+delta.y*delta.y;
       if ((distance >= (radius*radius)) ||
-          (GetPixelWriteMask(canvas_image,p) > (QuantumRange/2)))
+          (GetPixelWriteMask(canvas_image,p) <= (QuantumRange/2)))
         for (i=0; i < (ssize_t) GetPixelChannels(canvas_image); i++)
         {
           PixelChannel channel = GetPixelChannelChannel(canvas_image,i);
@@ -5227,7 +5227,7 @@ MagickExport Image *SwirlImage(const Image *image,double degrees,
       delta.x=scale.x*(double) (x-center.x);
       distance=delta.x*delta.x+delta.y*delta.y;
       if ((distance >= (radius*radius)) ||
-          (GetPixelWriteMask(canvas_image,p) > (QuantumRange/2)))
+          (GetPixelWriteMask(canvas_image,p) <= (QuantumRange/2)))
         {
           register ssize_t
             i;
@@ -5729,7 +5729,7 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude,
       }
     for (x=0; x < (ssize_t) wave_image->columns; x++)
     {
-      if (GetPixelWriteMask(image,p) > (QuantumRange/2))
+      if (GetPixelWriteMask(image,p) <= (QuantumRange/2))
         {
           register ssize_t
             i;
index a74ba1118cfa7f1994f88442b10776cd22efcf15..310eb535cc3f7db75fe3c024c485bb03786ef400 100644 (file)
@@ -3374,10 +3374,10 @@ MagickExport MagickBooleanType SetImageRegionMask(Image *image,
       Quantum
         pixel;
 
-      pixel=QuantumRange;
+      pixel=(Quantum) 0;
       if (((x >= region->x) && (x < (region->x+(ssize_t) region->width))) &&
           ((y >= region->y) && (y < (region->y+(ssize_t) region->height))))
-        pixel=(Quantum) 0;
+        pixel=QuantumRange;
       switch (type)
       {
         case ReadPixelMask: