commit 94190b79d7abf8261e3a1af37aa7a7f86757b2d6
author Dusan Veljko <v_duschan@hotmail.com> Mon Nov 09 14:45:26 2015 +0100
committer dirk <dirk@git.imagemagick.org> Thu Feb 11 23:02:44 2016 +0100
tree e070749b0725cdbf005837015a168fdf40bdf82f
parent d5a9b370d73940f19035e55634c15c77714031b8

Added usage of accelerated OCL functions

Conflicts:
	MagickCore/effect.c

MagickCore/effect.c

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index a61a803..e4efa9e 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -785,6 +785,9 @@
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
+  blur_image=AccelerateBlurImage(image,DefaultChannels,radius,sigma,exception);
+  if (blur_image != (Image *) NULL)
+    return(blur_image);
   (void) FormatLocaleString(geometry,MagickPathExtent,
     "blur:%.20gx%.20g;blur:%.20gx%.20g+90",radius,sigma,radius,sigma);
   kernel_info=AcquireKernelInfo(geometry,exception);
@@ -828,6 +831,11 @@
   Image
     *convolve_image;
 
+  convolve_image=AccelerateConvolveImage(image,DefaultChannels,kernel_info,
+    exception);
+  if (convolve_image != (Image *) NULL)
+    return(convolve_image);
+
   convolve_image=MorphologyImage(image,ConvolveMorphology,1,kernel_info,
     exception);
   return(convolve_image);
@@ -1000,6 +1008,9 @@
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
+  despeckle_image=AccelerateDespeckleImage(image,exception);
+  if (despeckle_image != (Image *) NULL)
+    return(despeckle_image);
   despeckle_image=CloneImage(image,0,0,MagickTrue,exception);
   if (despeckle_image == (Image *) NULL)
     return((Image *) NULL);
@@ -2788,6 +2799,10 @@
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
+  blur_image=AccelerateRotationalBlurImage(image,DefaultChannels,angle,
+    exception);
+  if (blur_image != (Image *) NULL)
+    return(blur_image);
   blur_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
   if (blur_image == (Image *) NULL)
     return((Image *) NULL);
@@ -3880,6 +3895,10 @@
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
+  unsharp_image=AccelerateUnsharpMaskImage(image,DefaultChannels,radius,sigma,
+    gain,threshold,exception);
+  if (unsharp_image != (Image *) NULL)
+    return(unsharp_image);
   unsharp_image=BlurImage(image,radius,sigma,exception);
   if (unsharp_image == (Image *) NULL)
     return((Image *) NULL);