]> granicus.if.org Git - imagemagick/commitdiff
Whitespace.
authordirk <dirk@git.imagemagick.org>
Wed, 20 Jul 2016 05:23:42 +0000 (07:23 +0200)
committerdirk <dirk@git.imagemagick.org>
Wed, 20 Jul 2016 05:23:42 +0000 (07:23 +0200)
MagickCore/accelerate-kernels-private.h
MagickCore/accelerate.c

index d6a0781d2d2c2f1b7cac3b8d27eac19a2a583bad..a97c75a707a0bae548f403f79a4e855e9cc0bb2b 100644 (file)
@@ -2511,7 +2511,6 @@ OPENCL_ENDIF()
           const unsigned int stopStep = MagickMin(startStep+numStepsPerWorkItem, n);
 
           unsigned int cacheIndex = start+startStep-cacheRangeStartX;
-
           for (unsigned int i = startStep; i < stopStep; i++, cacheIndex++)
           {
             float weight = getResizeFilterWeight(resizeFilterCubicCoefficients,
@@ -2520,7 +2519,7 @@ OPENCL_ENDIF()
               resizeFilterScale, resizeFilterWindowSupport,
               resizeFilterBlur, scale*(start + i - bisect + 0.5));
 
-            float4 cp = (float4) 0;
+            float4 cp = (float4)0.0f;
 
             __local CLQuantum *p = inputImageCache + (cacheIndex*number_channels);
             cp.x = (float) *(p);
@@ -2585,7 +2584,8 @@ OPENCL_ENDIF()
         {
           density = PerceptibleReciprocal(density);
           filteredPixel *= (float4) density;
-          gamma *= density;
+          if (alpha_index != 0)
+            gamma *= density;
         }
 
         if (alpha_index != 0)
@@ -2750,7 +2750,8 @@ OPENCL_ENDIF()
         {
           density = PerceptibleReciprocal(density);
           filteredPixel *= (float4) density;
-          gamma *= density;
+          if (alpha_index != 0)
+            gamma *= density;
         }
 
         if (alpha_index != 0)
index e07f16d5d2203217ffac5c53e69052bf332db8b7..cc91a4fd43140242dc2e13fb76805ea6cc326542 100644 (file)
@@ -4460,8 +4460,8 @@ static Image *ComputeResizeImage(const Image* image,MagickCLEnv clEnv,
   else
   {
     length=image->columns*resizedRows*number_channels;
-    tempImageBuffer=CreateOpenCLBuffer(device,CL_MEM_READ_WRITE,
-      length*sizeof(CLQuantum),(void *) NULL);
+    tempImageBuffer=CreateOpenCLBuffer(device,CL_MEM_READ_WRITE,length*
+      sizeof(CLQuantum),(void *) NULL);
     if (tempImageBuffer == (cl_mem) NULL)
     {
       (void) OpenCLThrowMagickException(device,exception,GetMagickModule(),