diff --git a/ImageMagick-filter.t.patch b/ImageMagick-filter.t.patch index 6cc101c..fb35f94 100644 --- a/ImageMagick-filter.t.patch +++ b/ImageMagick-filter.t.patch @@ -1,22 +1,49 @@ -Index: ImageMagick-7.0.8-9/PerlMagick/t/filter.t -=================================================================== ---- ImageMagick-7.0.8-9.orig/PerlMagick/t/filter.t 2018-08-06 00:27:10.000000000 +0200 -+++ ImageMagick-7.0.8-9/PerlMagick/t/filter.t 2018-08-06 15:58:12.191924568 +0200 -@@ -189,7 +189,7 @@ testFilterCompare('input.miff', q//, 'r - testFilterCompare('input.miff', q//, 'reference/filter/Solarize.miff', 'Solarize', q//, 0.0, 0.0); - ++$test; +diff --git a/MagickCore/fx.c b/MagickCore/fx.c +index 75b2b98c16..3bdc468273 100644 +--- a/MagickCore/fx.c ++++ b/MagickCore/fx.c +@@ -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; +diff --git a/MagickCore/image.c b/MagickCore/image.c +index a74ba1118c..310eb535cc 100644 +--- a/MagickCore/image.c ++++ b/MagickCore/image.c +@@ -3374,10 +3374,10 @@ MagickExport MagickBooleanType SetImageRegionMask(Image *image, + Quantum + pixel; --testFilterCompare('input.miff', q//, 'reference/filter/Swirl.miff', 'Swirl', q/90/, 0.0, 0.0); -+testFilterCompare('input.miff', q//, 'reference/filter/Swirl.miff', 'Swirl', q/90/, 0.01, 0.8); - ++$test; - - testFilterCompare('input.miff', q//, 'reference/filter/Threshold.miff', 'Threshold', q/90%/, 0.0, 0.0); -@@ -201,7 +201,7 @@ testFilterCompare('input.miff', q//, 'r - testFilterCompare('input.miff', q//, 'reference/filter/UnsharpMask.miff', 'UnsharpMask', q/'5x2+1'/, 0.004, 0.4); - ++$test; - --testFilterCompare('input.miff', q//, 'reference/filter/Wave.miff', 'Wave', q/'25x150'/, 0.0, 0.0); -+testFilterCompare('input.miff', q//, 'reference/filter/Wave.miff', 'Wave', q/'25x150'/, 0.4, 1.0); - ++$test; - - 1; +- 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: +