(no commit message)

diff --git a/magick/enhance.c b/magick/enhance.c
index 23fdf2f90ac7c50befa6eaaa916f9b7b6f6f28ef..55eb065075b2fc8cf5ca22c1da88b2c9ea809599 100644 (file)
--- a/magick/enhance.c
+++ b/magick/enhance.c
@@ -595,12 +595,12 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image,
     double
       luma;
 
-    register ssize_t
-      x;
-
     register PixelPacket
       *restrict q;
 
+    register ssize_t
+      x;
+
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
@@ -751,12 +751,12 @@ MagickExport MagickBooleanType ClutImageChannel(Image *image,
     register IndexPacket
       *restrict indexes;
 
-    register ssize_t
-      x;
-
     register PixelPacket
       *restrict q;
 
+    register ssize_t
+      x;
+
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
@@ -979,12 +979,12 @@ MagickExport MagickBooleanType ContrastImage(Image *image,
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
-    register ssize_t
-      x;
-
     register PixelPacket
       *restrict q;
 
+    register ssize_t
+      x;
+
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
@@ -1440,12 +1440,12 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image,
     register IndexPacket
       *restrict indexes;
 
-    register ssize_t
-      x;
-
     register PixelPacket
       *restrict q;
 
+    register ssize_t
+      x;
+
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
@@ -1621,12 +1621,12 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception)
     register const PixelPacket
       *restrict p;
 
-    register ssize_t
-      x;
-
     register PixelPacket
       *restrict q;
 
+    register ssize_t
+      x;
+
     /*
       Read another scan line.
     */
@@ -1914,12 +1914,12 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image,
     register IndexPacket
       *restrict indexes;
 
-    register ssize_t
-      x;
-
     register PixelPacket
       *restrict q;
 
+    register ssize_t
+      x;
+
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
@@ -2136,12 +2136,12 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image,
     register IndexPacket
       *restrict indexes;
 
-    register ssize_t
-      x;
-
     register PixelPacket
       *restrict q;
 
+    register ssize_t
+      x;
+
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
@@ -2342,12 +2342,12 @@ MagickExport MagickBooleanType HaldClutImageChannel(Image *image,
     register IndexPacket
       *restrict indexes;
 
-    register ssize_t
-      x;
-
     register PixelPacket
       *restrict q;
 
+    register ssize_t
+      x;
+
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
@@ -2579,12 +2579,12 @@ MagickExport MagickBooleanType LevelImageChannel(Image *image,
   MagickOffsetType
     progress;
 
-  register ssize_t
-    i;
-
   register double
     scale;
 
+  register ssize_t
+    i;
+
   ssize_t
     y;
 
@@ -2595,7 +2595,7 @@ MagickExport MagickBooleanType LevelImageChannel(Image *image,
   assert(image->signature == MagickSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
-  scale = (white_point != black_point) ? 1.0/(white_point-black_point) : 1.0;
+  scale=(white_point != black_point) ? 1.0/(white_point-black_point) : 1.0;
   if (image->storage_class == PseudoClass)
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(dynamic,4) shared(progress,status)
@@ -2629,12 +2629,12 @@ MagickExport MagickBooleanType LevelImageChannel(Image *image,
     register IndexPacket
       *restrict indexes;
 
-    register ssize_t
-      x;
-
     register PixelPacket
       *restrict q;
 
+    register ssize_t
+      x;
+
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
@@ -2789,12 +2789,12 @@ MagickExport MagickBooleanType LevelizeImageChannel(Image *image,
     register IndexPacket
       *restrict indexes;
 
-    register ssize_t
-      x;
-
     register PixelPacket
       *restrict q;
 
+    register ssize_t
+      x;
+
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
@@ -2835,6 +2835,7 @@ MagickExport MagickBooleanType LevelizeImageChannel(Image *image,
           status=MagickFalse;
       }
   }
+  image_view=DestroyCacheView(image_view);
   return(status);
 }
 \f
@@ -2989,11 +2990,6 @@ MagickExport MagickBooleanType LinearStretchImage(Image *image,
   ExceptionInfo
     *exception;
 
-  ssize_t
-    black,
-    white,
-    y;
-
   MagickBooleanType
     status;
 
@@ -3004,6 +3000,11 @@ MagickExport MagickBooleanType LinearStretchImage(Image *image,
   MagickSizeType
     number_pixels;
 
+  ssize_t
+    black,
+    white,
+    y;
+
   /*
     Allocate histogram and linear map.
   */
@@ -3274,12 +3275,12 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
-    register ssize_t
-      x;
-
     register PixelPacket
       *restrict q;
 
+    register ssize_t
+      x;
+
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
@@ -3446,12 +3447,12 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image,
         register IndexPacket
           *restrict indexes;
 
-        register ssize_t
-          x;
-
         register PixelPacket
           *restrict q;
 
+        register ssize_t
+          x;
+
         if (status == MagickFalse)
           continue;
         q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
@@ -3513,12 +3514,12 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image,
     register IndexPacket
       *restrict indexes;
 
-    register ssize_t
-      x;
-
     register PixelPacket
       *restrict q;
 
+    register ssize_t
+      x;
+
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
@@ -3780,12 +3781,12 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(Image *image,
     register IndexPacket
       *restrict indexes;
 
-    register ssize_t
-      x;
-
     register PixelPacket
       *restrict q;
 
+    register ssize_t
+      x;
+
     if (status == MagickFalse)
       continue;
     q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);