Added trace events for the compute methods.

diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c
index a5f7ba05f4827a46a5958c43bc74dd60053db80a..74fc390b54bcf1de6856f2e2e04e25d760a9526f 100644 (file)
--- a/MagickCore/accelerate.c
+++ b/MagickCore/accelerate.c
@@ -652,6 +652,11 @@ static Image *ComputeBlurImage(const Image* image,MagickCLEnv clEnv,
   blurColumnKernel=NULL;
   outputReady=MagickFalse;
 
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickCoreSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+
   device=RequestOpenCLDevice(clEnv);
   queue=AcquireOpenCLCommandQueue(device);
   filteredImage=cloneImage(image,exception);
@@ -837,6 +842,11 @@ static MagickBooleanType ComputeContrastImage(Image *image,MagickCLEnv clEnv,
     gsize[2],
     i;
 
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickCoreSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+
   contrastKernel=NULL;
   imageBuffer=NULL;
   outputReady=MagickFalse;
@@ -988,6 +998,11 @@ static MagickBooleanType ComputeContrastStretchImage(Image *image,
     *hostPtr,
     *inputPixels;
 
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickCoreSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+
   histogram=NULL;
   stretch_map=NULL;
   inputPixels = NULL;
@@ -999,12 +1014,6 @@ static MagickBooleanType ComputeContrastStretchImage(Image *image,
   queue = NULL;
   outputReady = MagickFalse;
 
-
-  assert(image != (Image *) NULL);
-  assert(image->signature == MagickCoreSignature);
-  if (image->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
-
   /* exception=(&image->exception); */
 
   /*
@@ -2308,6 +2317,11 @@ static MagickBooleanType ComputeEqualizeImage(Image *image,MagickCLEnv clEnv,
     *hostPtr,
     *inputPixels;
 
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickCoreSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+
   map=NULL;
   histogram=NULL;
   equalize_map=NULL;
@@ -2320,11 +2334,6 @@ static MagickBooleanType ComputeEqualizeImage(Image *image,MagickCLEnv clEnv,
   queue = NULL;
   outputReady = MagickFalse;
 
-  assert(image != (Image *) NULL);
-  assert(image->signature == MagickCoreSignature);
-  if (image->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
-
   /*
    * initialize opencl env
    */
@@ -2728,8 +2737,12 @@ static MagickBooleanType ComputeFunctionImage(Image *image,MagickCLEnv clEnv,
     gsize[2],
     i;
 
-  outputReady=MagickFalse;
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickCoreSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
 
+  outputReady=MagickFalse;
   imageBuffer=NULL;
   functionKernel=NULL;
   parametersBuffer=NULL;
@@ -2870,12 +2883,15 @@ static MagickBooleanType ComputeGrayscaleImage(Image *image,MagickCLEnv clEnv,
     gsize[2],
     i;
 
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickCoreSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+
   outputReady=MagickFalse;
   imageBuffer=NULL;
   grayscaleKernel=NULL;
 
-  assert(image != (Image *) NULL);
-  assert(image->signature == MagickCoreSignature);
   device=RequestOpenCLDevice(clEnv);
   queue=AcquireOpenCLCommandQueue(device);
   imageBuffer=GetAuthenticOpenCLBuffer(image,device,exception);
@@ -3368,15 +3384,15 @@ static MagickBooleanType ComputeModulateImage(Image *image,MagickCLEnv clEnv,
   void
     *inputPixels;
 
-  inputPixels = NULL;
-  imageBuffer = NULL;
-  modulateKernel = NULL;
-
   assert(image != (Image *) NULL);
   assert(image->signature == MagickCoreSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
 
+  inputPixels = NULL;
+  imageBuffer = NULL;
+  modulateKernel = NULL;
+
   /*
    * initialize opencl env
    */
@@ -3602,6 +3618,11 @@ static Image* ComputeMotionBlurImage(const Image *image,MagickCLEnv clEnv,
     *filteredPixels,
     *hostPtr;
 
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickCoreSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+
   outputReady = MagickFalse;
   filteredImage = NULL;
   filteredImage_view = NULL;
@@ -3616,7 +3637,8 @@ static Image* ComputeMotionBlurImage(const Image *image,MagickCLEnv clEnv,
   /* Create and initialize OpenCL buffers. */
 
   image_view=AcquireAuthenticCacheView(image,exception);
-  inputPixels=GetCacheViewAuthenticPixels(image_view,0,0,image->columns,image->rows,exception);
+  inputPixels=GetCacheViewAuthenticPixels(image_view,0,0,image->columns,
+    image->rows,exception);
   if (inputPixels == (const void *) NULL)
   {
     (void) ThrowMagickException(exception,GetMagickModule(),CacheError,
@@ -4535,6 +4557,11 @@ static Image* ComputeRotationalBlurImage(const Image *image,MagickCLEnv clEnv,
     gsize[2],
     i;
 
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickCoreSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+
   filteredImage=NULL;
   imageBuffer=NULL;
   filteredImageBuffer=NULL;