Additional code formatting tweaks

... detected with an improved version of our checkstyle script

diff --git a/jcsample.c b/jcsample.c
index a36f5bb43f8952a15e74a5600f4944c43adc7a4f..bd27b84e068a06434dfd6694ab8d5a0d7c5a9774 100644 (file)
--- a/jcsample.c
+++ b/jcsample.c
@@ -280,7 +280,7 @@ h2v2_downsample(j_compress_ptr cinfo, jpeg_component_info *compptr,
         (JSAMPLE)((GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
                    GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]) + bias) >> 2);
       bias ^= 3;                /* 1=>2, 2=>1 */
-      inptr0 += 2; inptr1 += 2;
+      inptr0 += 2;  inptr1 += 2;
     }
     inrow += 2;
   }
@@ -348,7 +348,7 @@ h2v2_smooth_downsample(j_compress_ptr cinfo, jpeg_component_info *compptr,
                 GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[2]);
     membersum = membersum * memberscale + neighsum * neighscale;
     *outptr++ = (JSAMPLE)((membersum + 32768) >> 16);
-    inptr0 += 2; inptr1 += 2; above_ptr += 2; below_ptr += 2;
+    inptr0 += 2;  inptr1 += 2;  above_ptr += 2;  below_ptr += 2;
 
     for (colctr = output_cols - 2; colctr > 0; colctr--) {
       /* sum of pixels directly mapped to this output element */
@@ -368,7 +368,7 @@ h2v2_smooth_downsample(j_compress_ptr cinfo, jpeg_component_info *compptr,
       membersum = membersum * memberscale + neighsum * neighscale;
       /* round, descale and output it */
       *outptr++ = (JSAMPLE)((membersum + 32768) >> 16);
-      inptr0 += 2; inptr1 += 2; above_ptr += 2; below_ptr += 2;
+      inptr0 += 2;  inptr1 += 2;  above_ptr += 2;  below_ptr += 2;
     }
 
     /* Special case for last column */
@@ -437,17 +437,17 @@ fullsize_smooth_downsample(j_compress_ptr cinfo, jpeg_component_info *compptr,
     neighsum = colsum + (colsum - membersum) + nextcolsum;
     membersum = membersum * memberscale + neighsum * neighscale;
     *outptr++ = (JSAMPLE)((membersum + 32768) >> 16);
-    lastcolsum = colsum; colsum = nextcolsum;
+    lastcolsum = colsum;  colsum = nextcolsum;
 
     for (colctr = output_cols - 2; colctr > 0; colctr--) {
       membersum = GETJSAMPLE(*inptr++);
-      above_ptr++; below_ptr++;
+      above_ptr++;  below_ptr++;
       nextcolsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(*below_ptr) +
                    GETJSAMPLE(*inptr);
       neighsum = lastcolsum + (colsum - membersum) + nextcolsum;
       membersum = membersum * memberscale + neighsum * neighscale;
       *outptr++ = (JSAMPLE)((membersum + 32768) >> 16);
-      lastcolsum = colsum; colsum = nextcolsum;
+      lastcolsum = colsum;  colsum = nextcolsum;
     }
 
     /* Special case for last column */

diff --git a/jdhuff.h b/jdhuff.h
index b2a466890492cfd81993716bead62715bd58dfdf..6a8d90f4027c9f1ad3c2a0e58a935c028fe76a5d 100644 (file)
--- a/jdhuff.h
+++ b/jdhuff.h
@@ -152,7 +152,7 @@ typedef struct {                /* Bitreading working state within an MCU */
   if (bits_left < (nbits)) { \
     if (!jpeg_fill_bit_buffer(&(state), get_buffer, bits_left, nbits)) \
       { action; } \
-    get_buffer = (state).get_buffer; bits_left = (state).bits_left; \
+    get_buffer = (state).get_buffer;  bits_left = (state).bits_left; \
   } \
 }
 
@@ -193,9 +193,9 @@ EXTERN(boolean) jpeg_fill_bit_buffer(bitread_working_state *state,
   if (bits_left < HUFF_LOOKAHEAD) { \
     if (!jpeg_fill_bit_buffer(&state, get_buffer, bits_left, 0)) \
       { failaction; } \
-    get_buffer = state.get_buffer; bits_left = state.bits_left; \
+    get_buffer = state.get_buffer;  bits_left = state.bits_left; \
     if (bits_left < HUFF_LOOKAHEAD) { \
-      nb = 1; goto slowlabel; \
+      nb = 1;  goto slowlabel; \
     } \
   } \
   look = PEEK_BITS(HUFF_LOOKAHEAD); \
@@ -207,7 +207,7 @@ slowlabel: \
     if ((result = \
          jpeg_huff_decode(&state, get_buffer, bits_left, htbl, nb)) < 0) \
       { failaction; } \
-    get_buffer = state.get_buffer; bits_left = state.bits_left; \
+    get_buffer = state.get_buffer;  bits_left = state.bits_left; \
   } \
 }
 

diff --git a/jerror.h b/jerror.h
index e54cc305a148f5bb7390662c94c5b97a59303828..933a3690fdf4b52d312339e7cfeeb6e6bab6b3d2 100644 (file)
--- a/jerror.h
+++ b/jerror.h
@@ -288,24 +288,24 @@ JMESSAGE(JWRN_BOGUS_ICC, "Corrupt JPEG data: bad ICC marker")
    (*(cinfo)->err->emit_message) ((j_common_ptr)(cinfo), (lvl)))
 #define TRACEMS3(cinfo, lvl, code, p1, p2, p3) \
   MAKESTMT(int *_mp = (cinfo)->err->msg_parm.i; \
-           _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); \
+           _mp[0] = (p1);  _mp[1] = (p2);  _mp[2] = (p3); \
            (cinfo)->err->msg_code = (code); \
            (*(cinfo)->err->emit_message) ((j_common_ptr)(cinfo), (lvl)); )
 #define TRACEMS4(cinfo, lvl, code, p1, p2, p3, p4) \
   MAKESTMT(int *_mp = (cinfo)->err->msg_parm.i; \
-           _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
+           _mp[0] = (p1);  _mp[1] = (p2);  _mp[2] = (p3);  _mp[3] = (p4); \
            (cinfo)->err->msg_code = (code); \
            (*(cinfo)->err->emit_message) ((j_common_ptr)(cinfo), (lvl)); )
 #define TRACEMS5(cinfo, lvl, code, p1, p2, p3, p4, p5) \
   MAKESTMT(int *_mp = (cinfo)->err->msg_parm.i; \
-           _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
+           _mp[0] = (p1);  _mp[1] = (p2);  _mp[2] = (p3);  _mp[3] = (p4); \
            _mp[4] = (p5); \
            (cinfo)->err->msg_code = (code); \
            (*(cinfo)->err->emit_message) ((j_common_ptr)(cinfo), (lvl)); )
 #define TRACEMS8(cinfo, lvl, code, p1, p2, p3, p4, p5, p6, p7, p8) \
   MAKESTMT(int *_mp = (cinfo)->err->msg_parm.i; \
-           _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
-           _mp[4] = (p5); _mp[5] = (p6); _mp[6] = (p7); _mp[7] = (p8); \
+           _mp[0] = (p1);  _mp[1] = (p2);  _mp[2] = (p3);  _mp[3] = (p4); \
+           _mp[4] = (p5);  _mp[5] = (p6);  _mp[6] = (p7);  _mp[7] = (p8); \
            (cinfo)->err->msg_code = (code); \
            (*(cinfo)->err->emit_message) ((j_common_ptr)(cinfo), (lvl)); )
 #define TRACEMSS(cinfo, lvl, code, str) \

diff --git a/md5/md5.c b/md5/md5.c
index 2cbb9f70667a45fc1082d29cc3c92862c40e968f..cf8aae690fc7338a599ab84bc38c63d97557bca0 100644 (file)
--- a/md5/md5.c
+++ b/md5/md5.c
@@ -56,7 +56,7 @@ static void byteReverse(unsigned char *buf, unsigned int longs)
 {
   uint32 t;
   do {
-    t = (uint32) ((unsigned int)buf[3] << 8 | buf[2]) << 16 |
+    t = (uint32)((unsigned int)buf[3] << 8 | buf[2]) << 16 |
         ((unsigned int)buf[1] << 8 | buf[0]);
     *(uint32 *) buf = t;
     buf += 4;

diff --git a/rdjpgcom.c b/rdjpgcom.c
index f22b1e8989fbbd93863bdb810bc959e73d1b12a6..e9f31d2ab8f439def2494b744bfbee9e2ab8c6eb 100644 (file)
--- a/rdjpgcom.c
+++ b/rdjpgcom.c
@@ -301,7 +301,8 @@ process_SOFn(int marker)
   case M_SOF10: process = "Progressive, arithmetic coding";  break;
   case M_SOF11: process = "Lossless, arithmetic coding";  break;
   case M_SOF13: process = "Differential sequential, arithmetic coding";  break;
-  case M_SOF14: process = "Differential progressive, arithmetic coding"; break;
+  case M_SOF14:
+    process = "Differential progressive, arithmetic coding";  break;
   case M_SOF15: process = "Differential lossless, arithmetic coding";  break;
   default:      process = "Unknown";  break;
   }

diff --git a/simd/loongson/jccolor-mmi.c b/simd/loongson/jccolor-mmi.c
index fd4d20d858dafb63635bed7c2db9782fa5a43539..93ef5c79f790eb5b23bf22d4d0c7076a1c20b4ba 100644 (file)
--- a/simd/loongson/jccolor-mmi.c
+++ b/simd/loongson/jccolor-mmi.c
@@ -30,8 +30,8 @@
 #include "jsimd_mmi.h"
 
 
-#define F_0_081  ((short) 5329)               /* FIX(0.08131) */
-#define F_0_114  ((short) 7471)               /* FIX(0.11400) */
+#define F_0_081  ((short)5329)                /* FIX(0.08131) */
+#define F_0_114  ((short)7471)                /* FIX(0.11400) */
 #define F_0_168  ((short)11059)               /* FIX(0.16874) */
 #define F_0_250  ((short)16384)               /* FIX(0.25000) */
 #define F_0_299  ((short)19595)               /* FIX(0.29900) */