(no commit message)

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 9115930d9009fc2a17173a01ec031a1e1c1481c3..7a612aaa2ba7ab35997df6b4fc21912456e9ecff 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -1298,10 +1298,6 @@ MagickExport Image *ConvolveImage(const Image *image,
     register ssize_t
       x;
 
-    size_t
-      channels,
-      convolve_channels;
-
     ssize_t
       center;
 
@@ -1317,16 +1313,14 @@ MagickExport Image *ConvolveImage(const Image *image,
         status=MagickFalse;
         continue;
       }
-    channels=GetPixelChannels(image);
-    convolve_channels=GetPixelChannels(convolve_image);
-    center=channels*(image->columns+kernel_info->width)*(kernel_info->height/
-      2L)+channels*(kernel_info->width/2);
+    center=GetPixelChannels(image)*(image->columns+kernel_info->width)*
+      (kernel_info->height/2L)+GetPixelChannels(image)*(kernel_info->width/2);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) channels; i++)
+      for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
       {
         MagickRealType
           alpha,
@@ -1380,9 +1374,9 @@ MagickExport Image *ConvolveImage(const Image *image,
               {
                 pixel+=(*k)*pixels[i];
                 k++;
-                pixels+=channels;
+                pixels+=GetPixelChannels(image);
               }
-              pixels+=image->columns*channels;
+              pixels+=image->columns*GetPixelChannels(image);
             }
             q[channel]=ClampToQuantum(pixel);
             continue;
@@ -1399,15 +1393,15 @@ MagickExport Image *ConvolveImage(const Image *image,
             pixel+=(*k)*alpha*pixels[i];
             gamma+=(*k)*alpha;
             k++;
-            pixels+=channels;
+            pixels+=GetPixelChannels(image);
           }
-          pixels+=image->columns*channels;
+          pixels+=image->columns*GetPixelChannels(image);
         }
         gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
         q[channel]=ClampToQuantum(gamma*pixel);
       }
-      p+=channels;
-      q+=convolve_channels;
+      p+=GetPixelChannels(image);
+      q+=GetPixelChannels(convolve_image);
     }
     if (SyncCacheViewAuthenticPixels(convolve_view,exception) == MagickFalse)
       status=MagickFalse;

diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 7e7b813fd103715cfad550a0fcbd642095a1a1e7..7422ada3d14b6386de03b4333307de565b280cf1 100644 (file)
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -111,7 +111,7 @@ MagickExport MagickBooleanType AutoGammaImage(Image *image)
   if (image->sync != MagickFalse)
     {
       /*
-        Apply gamma correction equally accross all given channels
+        Apply gamma correction equally accross all given channels.
       */
       (void) GetImageMean(image,&mean,&sans,&image->exception);
       gamma=log(mean*QuantumScale)/log_mean;
@@ -1939,9 +1939,6 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma)
   register ssize_t
     i;
 
-  size_t
-    channels;
-
   ssize_t
     y;
 
@@ -1997,7 +1994,6 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma)
   progress=0;
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-  channels=GetPixelChannels(image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(dynamic,4) shared(progress,status)
 #endif
@@ -2022,7 +2018,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma)
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) channels; i++)
+      for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
       {
         PixelTrait
           traits;
@@ -2031,7 +2027,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma)
         if ((traits & UpdatePixelTrait) != 0)
           q[i]=gamma_map[ScaleQuantumToMap(q[i])];
       }
-      q+=channels;
+      q+=GetPixelChannels(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;
@@ -3136,9 +3132,6 @@ MagickExport MagickBooleanType NegateImage(Image *image,
   ssize_t
     y;
 
-  size_t
-    channels;
-
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
   if (image->debug != MagickFalse)
@@ -3175,7 +3168,6 @@ MagickExport MagickBooleanType NegateImage(Image *image,
   progress=0;
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-  channels=GetPixelChannels(image);
   if (grayscale != MagickFalse)
     {
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -3208,10 +3200,10 @@ MagickExport MagickBooleanType NegateImage(Image *image,
 
           if (IsPixelGray(image,q) != MagickFalse)
             {
-              q+=channels;
+              q+=GetPixelChannels(image);
               continue;
             }
-          for (i=0; i < (ssize_t) channels; i++)
+          for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
           {
             PixelTrait 
               traits;
@@ -3220,7 +3212,7 @@ MagickExport MagickBooleanType NegateImage(Image *image,
             if ((traits & UpdatePixelTrait) != 0)
               q[i]=QuantumRange-q[i];
           }
-          q+=channels;
+          q+=GetPixelChannels(image);
         }
         sync=SyncCacheViewAuthenticPixels(image_view,exception);
         if (sync == MagickFalse)
@@ -3269,7 +3261,7 @@ MagickExport MagickBooleanType NegateImage(Image *image,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) channels; i++)
+      for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
       {
         PixelTrait 
           traits;
@@ -3278,7 +3270,7 @@ MagickExport MagickBooleanType NegateImage(Image *image,
         if ((traits & UpdatePixelTrait) != 0)
           q[i]=QuantumRange-q[i];
       }
-      q+=channels;
+      q+=GetPixelChannels(image);
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;