From 88fce67336199f7c58330a2bdca80b313474ae1d Mon Sep 17 00:00:00 2001 From: Cristy Date: Mon, 21 Jan 2019 19:37:00 -0500 Subject: [PATCH] Clamp -charcoal to replicate IMv6 results --- MagickCore/fx.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 6bcd7ad36..031b7aa31 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -92,6 +92,7 @@ #include "MagickCore/string_.h" #include "MagickCore/string-private.h" #include "MagickCore/thread-private.h" +#include "MagickCore/threshold.h" #include "MagickCore/transform.h" #include "MagickCore/transform-private.h" #include "MagickCore/utility.h" @@ -597,6 +598,9 @@ MagickExport Image *CharcoalImage(const Image *image,const double radius, *charcoal_image, *edge_image; + MagickBooleanType + status; + assert(image != (Image *) NULL); assert(image->signature == MagickCoreSignature); if (image->debug != MagickFalse) @@ -606,13 +610,20 @@ MagickExport Image *CharcoalImage(const Image *image,const double radius, edge_image=EdgeImage(image,radius,exception); if (edge_image == (Image *) NULL) return((Image *) NULL); - charcoal_image=BlurImage(edge_image,radius,sigma,exception); + charcoal_image=(Image *) NULL; + status=ClampImage(edge_image,exception); + if (status != MagickFalse) + charcoal_image=BlurImage(edge_image,radius,sigma,exception); edge_image=DestroyImage(edge_image); if (charcoal_image == (Image *) NULL) return((Image *) NULL); - (void) NormalizeImage(charcoal_image,exception); - (void) NegateImage(charcoal_image,MagickFalse,exception); - (void) GrayscaleImage(charcoal_image,image->intensity,exception); + status=NormalizeImage(charcoal_image,exception); + if (status != MagickFalse) + status=NegateImage(charcoal_image,MagickFalse,exception); + if (status != MagickFalse) + status=GrayscaleImage(charcoal_image,image->intensity,exception); + if (status == MagickFalse) + charcoal_image=DestroyImage(charcoal_image); return(charcoal_image); } -- 2.40.0