(no commit message)

[imagemagick] / coders / uyvy.c

diff --git a/coders/uyvy.c b/coders/uyvy.c
index 9a070060f3acfb22d280affc63b0814c5c7dc7b9..0bd1ff4c28d5d0b87a2a7e2d51370c4ccf18c098 100644 (file)
--- a/coders/uyvy.c
+++ b/coders/uyvy.c
@@ -98,9 +98,6 @@ static Image *ReadUYVYImage(const ImageInfo *image_info,
   Image
     *image;
 
-  ssize_t
-    y;
-
   MagickBooleanType
     status;
 
@@ -110,6 +107,9 @@ static Image *ReadUYVYImage(const ImageInfo *image_info,
   register PixelPacket
     *q;
 
+  ssize_t
+    y;
+
   unsigned char
     u,
     v,
@@ -158,19 +158,19 @@ static Image *ReadUYVYImage(const ImageInfo *image_info,
       y1=(unsigned char) ReadBlobByte(image);
       v=(unsigned char) ReadBlobByte(image);
       y2=(unsigned char) ReadBlobByte(image);
-      q->red=ScaleCharToQuantum(y1);
-      q->green=ScaleCharToQuantum(u);
-      q->blue=ScaleCharToQuantum(v);
+      SetRedPixelComponent(q,ScaleCharToQuantum(y1));
+      SetGreenPixelComponent(q,ScaleCharToQuantum(u));
+      SetBluePixelComponent(q,ScaleCharToQuantum(v));
       q++;
-      q->red=ScaleCharToQuantum(y2);
-      q->green=ScaleCharToQuantum(u);
-      q->blue=ScaleCharToQuantum(v);
+      SetRedPixelComponent(q,ScaleCharToQuantum(y2));
+      SetGreenPixelComponent(q,ScaleCharToQuantum(u));
+      SetBluePixelComponent(q,ScaleCharToQuantum(v));
       q++;
     }
     if (SyncAuthenticPixels(image,exception) == MagickFalse)
       break;
     status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
-                image->rows);
+      image->rows);
     if (status == MagickFalse)
       break;
   }
@@ -293,9 +293,6 @@ static MagickBooleanType WriteUYVYImage(const ImageInfo *image_info,
   Image
     *uyvy_image;
 
-  ssize_t
-    y;
-
   MagickBooleanType
     full,
     status;
@@ -306,6 +303,9 @@ static MagickBooleanType WriteUYVYImage(const ImageInfo *image_info,
   register ssize_t
     x;
 
+  ssize_t
+    y;
+
   /*
     Open output image file.
   */
@@ -343,7 +343,8 @@ static MagickBooleanType WriteUYVYImage(const ImageInfo *image_info,
           (void) WriteBlobByte(image,ScaleQuantumToChar((Quantum) pixel.green));
           (void) WriteBlobByte(image,ScaleQuantumToChar((Quantum) pixel.red));
           (void) WriteBlobByte(image,ScaleQuantumToChar((Quantum) pixel.blue));
-          (void) WriteBlobByte(image,ScaleQuantumToChar(GetRedPixelComponent(p)));
+          (void) WriteBlobByte(image,ScaleQuantumToChar(
+             GetRedPixelComponent(p)));
         }
       pixel.red=(double) GetRedPixelComponent(p);
       pixel.green=(double) GetGreenPixelComponent(p);
@@ -352,7 +353,7 @@ static MagickBooleanType WriteUYVYImage(const ImageInfo *image_info,
       p++;
     }
     status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
-                image->rows);
+      image->rows);
     if (status == MagickFalse)
       break;
   }