Restore the ANSI C compliance after adding the ARM optimization

Also apply style and formatting fixes

1 files changed, 35 insertions, 29 deletions

diff --git a/arm/palette_neon_intrinsics.c b/arm/palette_neon_intrinsics.c
index 90fc2e490..c01db1171 100644
--- a/arm/palette_neon_intrinsics.c
+++ b/arm/palette_neon_intrinsics.c
@@ -22,11 +22,7 @@ png_riffle_palette_rgba(png_structrp png_ptr, png_row_infop row_info)
    png_bytep riffled_palette = png_ptr->riffled_palette;
    png_const_bytep trans_alpha = png_ptr->trans_alpha;
    int num_trans = png_ptr->num_trans;
-
-   if (row_info->bit_depth != 8) {
-      png_error(png_ptr, "bit_depth must be 8 for png_riffle_palette_rgba");
-      return;
-   }
+   int i;
 
    /* Initially black, opaque. */
    uint8x16x4_t w = {{
@@ -36,10 +32,17 @@ png_riffle_palette_rgba(png_structrp png_ptr, png_row_infop row_info)
       vdupq_n_u8(0xff),
    }};
 
-   int i;
+   if (row_info->bit_depth != 8)
+   {
+      png_error(png_ptr, "bit_depth must be 8 for png_riffle_palette_rgba");
+      return;
+   }
+
    /* First, riffle the RGB colours into a RGBA palette, the A value is
-    * set to opaque for now. */
-   for (i = 0; i < (1 << row_info->bit_depth); i += 16) {
+    * set to opaque for now.
+    */
+   for (i = 0; i < (1 << row_info->bit_depth); i += 16)
+   {
       uint8x16x3_t v = vld3q_u8((png_const_bytep)(palette + i));
       w.val[0] = v.val[0];
       w.val[1] = v.val[1];
@@ -48,33 +51,32 @@ png_riffle_palette_rgba(png_structrp png_ptr, png_row_infop row_info)
    }
 
    /* Fix up the missing transparency values. */
-   for (i = 0; i < num_trans; i++) {
+   for (i = 0; i < num_trans; i++)
       riffled_palette[(i << 2) + 3] = trans_alpha[i];
-   }
 }
 
-
 /* Expands a palettized row into RGBA. */
 int
 png_do_expand_palette_neon_rgba(png_structrp png_ptr, png_row_infop row_info,
-   png_const_bytep row, const png_bytepp ssp, const png_bytepp ddp)
+    png_const_bytep row, png_bytepp ssp, png_bytepp ddp)
 {
-
    png_uint_32 row_width = row_info->width;
-   const png_uint_32 *riffled_palette = (const png_uint_32*)png_ptr->riffled_palette;
+   const png_uint_32 *riffled_palette =
+      (const png_uint_32 *)png_ptr->riffled_palette;
    const png_int_32 pixels_per_chunk = 4;
+   int i;
 
-   if (row_width < pixels_per_chunk) {
+   if (row_width < pixels_per_chunk)
       return 0;
-   }
 
    /* This function originally gets the last byte of the output row.
-      The NEON part writes forward from a given position, so we have
-      to seek this back by 4 pixels x 4 bytes. */
+    * The NEON part writes forward from a given position, so we have
+    * to seek this back by 4 pixels x 4 bytes.
+    */
    *ddp = *ddp - ((pixels_per_chunk * sizeof(png_uint_32)) - 1);
 
-   int i;
-   for (i = 0; i < row_width; i += pixels_per_chunk) {
+   for (i = 0; i < row_width; i += pixels_per_chunk)
+   {
       uint32x4_t cur;
       png_bytep sp = *ssp - i, dp = *ddp - (i << 2);
       cur = vld1q_dup_u32 (riffled_palette + *(sp - 3));
@@ -83,8 +85,10 @@ png_do_expand_palette_neon_rgba(png_structrp png_ptr, png_row_infop row_info,
       cur = vld1q_lane_u32(riffled_palette + *(sp - 0), cur, 3);
       vst1q_u32((void *)dp, cur);
    }
-   if (i != row_width) {
-      i -= pixels_per_chunk; /* Remove the amount that wasn't processed. */
+   if (i != row_width)
+   {
+      /* Remove the amount that wasn't processed. */
+      i -= pixels_per_chunk;
    }
 
    /* Decrement output pointers. */
@@ -96,21 +100,21 @@ png_do_expand_palette_neon_rgba(png_structrp png_ptr, png_row_infop row_info,
 /* Expands a palettized row into RGB format. */
 int
 png_do_expand_palette_neon_rgb(png_structrp png_ptr, png_row_infop row_info,
-   png_const_bytep row, const png_bytepp ssp, const png_bytepp ddp)
+    png_const_bytep row, png_bytepp ssp, png_bytepp ddp)
 {
    png_uint_32 row_width = row_info->width;
    png_const_bytep palette = (png_const_bytep)png_ptr->palette;
    const png_uint_32 pixels_per_chunk = 8;
+   int i;
 
-   if (row_width <= pixels_per_chunk) {
+   if (row_width <= pixels_per_chunk)
       return 0;
-   }
 
    /* Seeking this back by 8 pixels x 3 bytes. */
    *ddp = *ddp - ((pixels_per_chunk * sizeof(png_color)) - 1);
 
-   int i;
-   for (i = 0; i < row_width; i += pixels_per_chunk) {
+   for (i = 0; i < row_width; i += pixels_per_chunk)
+   {
       uint8x8x3_t cur;
       png_bytep sp = *ssp - i, dp = *ddp - ((i << 1) + i);
       cur = vld3_dup_u8(palette + sizeof(png_color) * (*(sp - 7)));
@@ -124,8 +128,10 @@ png_do_expand_palette_neon_rgb(png_structrp png_ptr, png_row_infop row_info,
       vst3_u8((void *)dp, cur);
    }
 
-   if (i != row_width) {
-      i -= pixels_per_chunk; /* Remove the amount that wasn't processed. */
+   if (i != row_width)
+   {
+      /* Remove the amount that wasn't processed. */
+      i -= pixels_per_chunk;
    }
 
    /* Decrement output pointers. */