commit 202de443c199963563857f50153b88fbe65afa80
author cristy <urban-warrior@git.imagemagick.org> Sun Apr 24 18:19:07 2011 +0000
committer cristy <urban-warrior@git.imagemagick.org> Sun Apr 24 18:19:07 2011 +0000
tree 5d4d609c3fedae2cf042cc3573f04b0913c7c145
parent 5ae0cc7ac9e5fc04296b0d9e63bca8b194beeb2d

coders/dpx.c

diff --git a/coders/dpx.c b/coders/dpx.c
index b439be4..788e05e 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -549,10 +549,6 @@
   Image
     *image;
 
-  ssize_t
-    row,
-    y;
-
   MagickBooleanType
     status;
 
@@ -568,18 +564,18 @@
   register ssize_t
     i;
 
-  ssize_t
-    count;
-
   size_t
-    extent;
+    extent,
+    samples_per_pixel;
+
+  ssize_t
+    count,
+    row,
+    y;
 
   unsigned char
     component_type;
 
-  size_t
-    samples_per_pixel;
-
   /*
     Open image file.
   */
@@ -681,14 +677,14 @@
   switch (dpx.image.orientation)
   {
     default:
-    case 0:  image->orientation=TopLeftOrientation; break;
-    case 1:  image->orientation=TopRightOrientation; break;
-    case 2:  image->orientation=BottomLeftOrientation; break;
-    case 3:  image->orientation=BottomRightOrientation; break;
-    case 4:  image->orientation=LeftTopOrientation; break;
-    case 5:  image->orientation=RightTopOrientation; break;
-    case 6:  image->orientation=LeftBottomOrientation; break;
-    case 7:  image->orientation=RightBottomOrientation; break;
+    case 0: image->orientation=TopLeftOrientation; break;
+    case 1: image->orientation=TopRightOrientation; break;
+    case 2: image->orientation=BottomLeftOrientation; break;
+    case 3: image->orientation=BottomRightOrientation; break;
+    case 4: image->orientation=LeftTopOrientation; break;
+    case 5: image->orientation=RightTopOrientation; break;
+    case 6: image->orientation=LeftBottomOrientation; break;
+    case 7: image->orientation=RightBottomOrientation; break;
   }
   dpx.image.number_elements=ReadBlobShort(image);
   offset+=2;
@@ -1078,21 +1074,19 @@
     MagickTrue : MagickFalse);
   for (y=0; y < (ssize_t) image->rows; y++)
   {
-    ssize_t
-      offset;
-
     MagickBooleanType
       sync;
 
     register PixelPacket
       *q;
 
-    ssize_t
-      count;
-
     size_t
       length;
 
+    ssize_t
+      count,
+      offset;
+
     unsigned char
       *pixels;
 
@@ -1108,7 +1102,7 @@
             proceed;
 
           proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType) row,
-                image->rows);
+            image->rows);
           if (proceed == MagickFalse)
             status=MagickFalse;
         }
@@ -1288,11 +1282,6 @@
   DPXInfo
     dpx;
 
-  ssize_t
-    horizontal_factor,
-    vertical_factor,
-    y;
-
   MagickBooleanType
     status;
 
@@ -1317,12 +1306,15 @@
   register ssize_t
     i;
 
+  ssize_t
+    count,
+    horizontal_factor,
+    vertical_factor,
+    y;
+
   size_t
     extent;
 
-  ssize_t
-    count;
-
   time_t
     seconds;
 
@@ -1823,7 +1815,7 @@
     if (count != (ssize_t) extent)
       break;
     status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
-                image->rows);
+      image->rows);
     if (status == MagickFalse)
       break;
   }