From: Dirk Lemstra <dirk@git.imagemagick.org>
Date: Wed, 6 Sep 2017 19:42:18 +0000 (+0200)
Subject: Added call to AccelerateMotionBlurImage and added immediate return inside that functi... 
X-Git-Tag: 7.0.7-1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5baa1f0544cedd5fdf7c3ce399fcba5db0958393;p=imagemagick

Added call to AccelerateMotionBlurImage and added immediate return inside that function because it is broken.
---

diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c
index ce8cc2fca..007fc0fe6 100644
--- a/MagickCore/accelerate.c
+++ b/MagickCore/accelerate.c
@@ -3851,6 +3851,9 @@ MagickPrivate Image *AccelerateMotionBlurImage(const Image *image,
   assert(offset != (OffsetInfo *) NULL);
   assert(exception != (ExceptionInfo *) NULL);
 
+  /* This kernel is broken and needs to be fixed. */
+  return((Image *) NULL);
+
   if (checkAccelerateConditionRGBA(image) == MagickFalse)
     return((Image *) NULL);
 
diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index c3b3da0ce..aa309c6a9 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -2047,6 +2047,15 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius,
       kernel=(MagickRealType *) RelinquishAlignedMemory(kernel);
       ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
     }
+#if defined(MAGICKCORE_OPENCL_SUPPORT)
+  blur_image=AccelerateMotionBlurImage(image,kernel,width,offset,exception);
+  if (blur_image != (Image *) NULL)
+    {
+      kernel=(MagickRealType *) RelinquishAlignedMemory(kernel);
+      offset=(OffsetInfo *) RelinquishMagickMemory(offset);
+      return(blur_image);
+    }
+#endif
   blur_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
   if (blur_image == (Image *) NULL)
     {