]> granicus.if.org Git - imagemagick/commitdiff
Added call to AccelerateMotionBlurImage and added immediate return inside that functi...
authorDirk Lemstra <dirk@git.imagemagick.org>
Wed, 6 Sep 2017 19:42:18 +0000 (21:42 +0200)
committerDirk Lemstra <dirk@git.imagemagick.org>
Wed, 6 Sep 2017 19:42:18 +0000 (21:42 +0200)
MagickCore/accelerate.c
MagickCore/effect.c

index ce8cc2fca29117be3521fd09d2985b5e80441063..007fc0fe638e4b723c00ec2a8e9c735c27121785 100644 (file)
@@ -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);
 
index c3b3da0ced23d129ae8cf73bb3ffcfd32e8fb2b3..aa309c6a95048e6527e396a03881eb2eee43fa24 100644 (file)
@@ -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)
     {