From: dirk <dirk@git.imagemagick.org>
Date: Tue, 5 Apr 2016 19:55:03 +0000 (+0200)
Subject: Whitespace cleanup.
X-Git-Tag: 7.0.1-0~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=011f089b4f6438c0b05bdb4ab4cd4188c71fd338;p=imagemagick

Whitespace cleanup.
---

diff --git a/MagickCore/accelerate-private.h b/MagickCore/accelerate-private.h
index d2a6b1e49..b227b239d 100644
--- a/MagickCore/accelerate-private.h
+++ b/MagickCore/accelerate-private.h
@@ -2762,69 +2762,69 @@ STRINGIFY(
               density+=weight;
               gamma+=alpha;
             }
-         }
-      }
-    }
-
-    // initialize the accumulators to zero
-    if (itemID < actualNumPixelInThisChunk) {
-      outputPixelCache[itemID] = (float4)0.0f;
-      densityCache[itemID] = 0.0f;
-      if (matte != 0)
-        gammaCache[itemID] = 0.0f;
-    }
-    barrier(CLK_LOCAL_MEM_FENCE);
-
-    // accumulatte the filtered pixel value and the density
-    for (unsigned int i = 0; i < numItems; i++) {
-      if (pixelIndex != -1) {
-        if (itemID%numItems == i) {
-          outputPixelCache[pixelIndex]+=filteredPixel;
-          densityCache[pixelIndex]+=density;
-          if (matte!=0) {
-            gammaCache[pixelIndex]+=gamma;
           }
         }
       }
+
+      // initialize the accumulators to zero
+      if (itemID < actualNumPixelInThisChunk) {
+        outputPixelCache[itemID] = (float4)0.0f;
+        densityCache[itemID] = 0.0f;
+        if (matte != 0)
+          gammaCache[itemID] = 0.0f;
+      }
       barrier(CLK_LOCAL_MEM_FENCE);
-    }
 
-    if (itemID < actualNumPixelInThisChunk) {
-      if (matte==0) {
-        float density = densityCache[itemID];
-        float4 filteredPixel = outputPixelCache[itemID];
-        if (density!= 0.0f && density != 1.0)
-        {
-          density = PerceptibleReciprocal(density);
-          filteredPixel *= (float4)density;
+      // accumulatte the filtered pixel value and the density
+      for (unsigned int i = 0; i < numItems; i++) {
+        if (pixelIndex != -1) {
+          if (itemID%numItems == i) {
+            outputPixelCache[pixelIndex]+=filteredPixel;
+            densityCache[pixelIndex]+=density;
+            if (matte!=0) {
+              gammaCache[pixelIndex]+=gamma;
+            }
+          }
         }
-        filteredImage[y*filteredColumns+chunkStartX+itemID] = (CLPixelType) (ClampToQuantum(filteredPixel.x)
-                                                                       , ClampToQuantum(filteredPixel.y)
-                                                                       , ClampToQuantum(filteredPixel.z)
-                                                                       , ClampToQuantum(filteredPixel.w));
+        barrier(CLK_LOCAL_MEM_FENCE);
       }
-      else {
-        float density = densityCache[itemID];
-        float gamma = gammaCache[itemID];
-        float4 filteredPixel = outputPixelCache[itemID];
-
-        if (density!= 0.0f && density != 1.0) {
-          density = PerceptibleReciprocal(density);
-          filteredPixel *= (float4)density;
-          gamma *= density;
+
+      if (itemID < actualNumPixelInThisChunk) {
+        if (matte==0) {
+          float density = densityCache[itemID];
+          float4 filteredPixel = outputPixelCache[itemID];
+          if (density!= 0.0f && density != 1.0)
+          {
+            density = PerceptibleReciprocal(density);
+            filteredPixel *= (float4)density;
+          }
+          filteredImage[y*filteredColumns+chunkStartX+itemID] = (CLPixelType) (ClampToQuantum(filteredPixel.x)
+                                                                         , ClampToQuantum(filteredPixel.y)
+                                                                         , ClampToQuantum(filteredPixel.z)
+                                                                         , ClampToQuantum(filteredPixel.w));
         }
-        gamma = PerceptibleReciprocal(gamma);
+        else {
+          float density = densityCache[itemID];
+          float gamma = gammaCache[itemID];
+          float4 filteredPixel = outputPixelCache[itemID];
+
+          if (density!= 0.0f && density != 1.0) {
+            density = PerceptibleReciprocal(density);
+            filteredPixel *= (float4)density;
+            gamma *= density;
+          }
+          gamma = PerceptibleReciprocal(gamma);
 
-        CLPixelType fp;
-        fp = (CLPixelType) ( ClampToQuantum(gamma*filteredPixel.x)
-          , ClampToQuantum(gamma*filteredPixel.y)
-          , ClampToQuantum(gamma*filteredPixel.z)
-          , ClampToQuantum(filteredPixel.w));
+          CLPixelType fp;
+          fp = (CLPixelType) ( ClampToQuantum(gamma*filteredPixel.x)
+            , ClampToQuantum(gamma*filteredPixel.y)
+            , ClampToQuantum(gamma*filteredPixel.z)
+            , ClampToQuantum(filteredPixel.w));
 
-        filteredImage[y*filteredColumns+chunkStartX+itemID] = fp;
+          filteredImage[y*filteredColumns+chunkStartX+itemID] = fp;
 
+        }
       }
-    }
 
     } // end of chunking loop
   }
@@ -2932,69 +2932,69 @@ STRINGIFY(
               density+=weight;
               gamma+=alpha;
             }
-         }
-      }
-    }
-
-    // initialize the accumulators to zero
-    if (itemID < actualNumPixelInThisChunk) {
-      outputPixelCache[itemID] = (float4)0.0f;
-      densityCache[itemID] = 0.0f;
-      if (matte != 0)
-        gammaCache[itemID] = 0.0f;
-    }
-    barrier(CLK_LOCAL_MEM_FENCE);
-
-    // accumulatte the filtered pixel value and the density
-    for (unsigned int i = 0; i < numItems; i++) {
-      if (pixelIndex != -1) {
-        if (itemID%numItems == i) {
-          outputPixelCache[pixelIndex]+=filteredPixel;
-          densityCache[pixelIndex]+=density;
-          if (matte!=0) {
-            gammaCache[pixelIndex]+=gamma;
           }
         }
       }
+
+      // initialize the accumulators to zero
+      if (itemID < actualNumPixelInThisChunk) {
+        outputPixelCache[itemID] = (float4)0.0f;
+        densityCache[itemID] = 0.0f;
+        if (matte != 0)
+          gammaCache[itemID] = 0.0f;
+      }
       barrier(CLK_LOCAL_MEM_FENCE);
-    }
 
-    if (itemID < actualNumPixelInThisChunk) {
-      if (matte==0) {
-        float density = densityCache[itemID];
-        float4 filteredPixel = outputPixelCache[itemID];
-        if (density!= 0.0f && density != 1.0)
-        {
-          density = PerceptibleReciprocal(density);
-          filteredPixel *= (float4)density;
+      // accumulatte the filtered pixel value and the density
+      for (unsigned int i = 0; i < numItems; i++) {
+        if (pixelIndex != -1) {
+          if (itemID%numItems == i) {
+            outputPixelCache[pixelIndex]+=filteredPixel;
+            densityCache[pixelIndex]+=density;
+            if (matte!=0) {
+              gammaCache[pixelIndex]+=gamma;
+            }
+          }
         }
-        filteredImage[(chunkStartY+itemID)*filteredColumns+x] = (CLPixelType) (ClampToQuantum(filteredPixel.x)
-                                                                       , ClampToQuantum(filteredPixel.y)
-                                                                       , ClampToQuantum(filteredPixel.z)
-                                                                       , ClampToQuantum(filteredPixel.w));
+        barrier(CLK_LOCAL_MEM_FENCE);
       }
-      else {
-        float density = densityCache[itemID];
-        float gamma = gammaCache[itemID];
-        float4 filteredPixel = outputPixelCache[itemID];
-
-        if (density!= 0.0f && density != 1.0) {
-          density = PerceptibleReciprocal(density);
-          filteredPixel *= (float4)density;
-          gamma *= density;
+
+      if (itemID < actualNumPixelInThisChunk) {
+        if (matte==0) {
+          float density = densityCache[itemID];
+          float4 filteredPixel = outputPixelCache[itemID];
+          if (density!= 0.0f && density != 1.0)
+          {
+            density = PerceptibleReciprocal(density);
+            filteredPixel *= (float4)density;
+          }
+          filteredImage[(chunkStartY+itemID)*filteredColumns+x] = (CLPixelType) (ClampToQuantum(filteredPixel.x)
+                                                                         , ClampToQuantum(filteredPixel.y)
+                                                                         , ClampToQuantum(filteredPixel.z)
+                                                                         , ClampToQuantum(filteredPixel.w));
         }
-        gamma = PerceptibleReciprocal(gamma);
+        else {
+          float density = densityCache[itemID];
+          float gamma = gammaCache[itemID];
+          float4 filteredPixel = outputPixelCache[itemID];
+
+          if (density!= 0.0f && density != 1.0) {
+            density = PerceptibleReciprocal(density);
+            filteredPixel *= (float4)density;
+            gamma *= density;
+          }
+          gamma = PerceptibleReciprocal(gamma);
 
-        CLPixelType fp;
-        fp = (CLPixelType) ( ClampToQuantum(gamma*filteredPixel.x)
-          , ClampToQuantum(gamma*filteredPixel.y)
-          , ClampToQuantum(gamma*filteredPixel.z)
-          , ClampToQuantum(filteredPixel.w));
+          CLPixelType fp;
+          fp = (CLPixelType) ( ClampToQuantum(gamma*filteredPixel.x)
+            , ClampToQuantum(gamma*filteredPixel.y)
+            , ClampToQuantum(gamma*filteredPixel.z)
+            , ClampToQuantum(filteredPixel.w));
 
-        filteredImage[(chunkStartY+itemID)*filteredColumns+x] = fp;
+          filteredImage[(chunkStartY+itemID)*filteredColumns+x] = fp;
 
+        }
       }
-    }
 
     } // end of chunking loop
   }