COMP: ijg compiles now with '-pedantic -Werror' this way this is more VC6 compliant

diff --git a/src/jpeg/libijg/jcpred.c b/src/jpeg/libijg/jcpred.c
index 702aafaf4d56779e1a0890ced6bffe6b15975cf6..293596c1b9053e9605940631f7ca24282942fcaf 100644 (file)
--- a/src/jpeg/libijg/jcpred.c
+++ b/src/jpeg/libijg/jcpred.c
@@ -199,8 +199,8 @@ jpeg_difference_first_row(j_compress_ptr cinfo, int ci,
      JSAMPROW input_buf, JSAMPROW prev_row,
      JDIFFROW diff_buf, JDIMENSION width)
 {
-  (void)prev_row;
   DIFFERENCE_1D(INITIAL_PREDICTORx);
+  (void)prev_row;
 
   /*
    * Now that we have differenced the first row, we want to use the

diff --git a/src/jpeg/libijg/jdpred.c b/src/jpeg/libijg/jdpred.c
index 3e987bed9755f5363c81b5c0e108062351e83a04..4704fc4f9c3491959c56b1a6fcfe873f35e5253b 100644 (file)
--- a/src/jpeg/libijg/jdpred.c
+++ b/src/jpeg/libijg/jdpred.c
@@ -100,8 +100,8 @@ jpeg_undifference1(j_decompress_ptr cinfo, int comp_index,
        JDIFFROW diff_buf, JDIFFROW prev_row,
        JDIFFROW undiff_buf, JDIMENSION width)
 {
-  (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
   UNDIFFERENCE_1D(INITIAL_PREDICTOR2);
+  (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
 }
 
 METHODDEF(void)
@@ -109,8 +109,8 @@ jpeg_undifference2(j_decompress_ptr cinfo, int comp_index,
        JDIFFROW diff_buf, JDIFFROW prev_row,
        JDIFFROW undiff_buf, JDIMENSION width)
 {
-  (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
   UNDIFFERENCE_2D(PREDICTOR2);
+  (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
 }
 
 METHODDEF(void)
@@ -118,8 +118,8 @@ jpeg_undifference3(j_decompress_ptr cinfo, int comp_index,
        JDIFFROW diff_buf, JDIFFROW prev_row,
        JDIFFROW undiff_buf, JDIMENSION width)
 {
-  (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
   UNDIFFERENCE_2D(PREDICTOR3);
+  (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
 }
 
 METHODDEF(void)
@@ -127,8 +127,8 @@ jpeg_undifference4(j_decompress_ptr cinfo, int comp_index,
        JDIFFROW diff_buf, JDIFFROW prev_row,
        JDIFFROW undiff_buf, JDIMENSION width)
 {
-  (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
   UNDIFFERENCE_2D(PREDICTOR4);
+  (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
 }
 
 METHODDEF(void)
@@ -136,9 +136,9 @@ jpeg_undifference5(j_decompress_ptr cinfo, int comp_index,
        JDIFFROW diff_buf, JDIFFROW prev_row,
        JDIFFROW undiff_buf, JDIMENSION width)
 {
-  (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
   SHIFT_TEMPS
   UNDIFFERENCE_2D(PREDICTOR5);
+  (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
 }
 
 METHODDEF(void)
@@ -146,9 +146,9 @@ jpeg_undifference6(j_decompress_ptr cinfo, int comp_index,
        JDIFFROW diff_buf, JDIFFROW prev_row,
        JDIFFROW undiff_buf, JDIMENSION width)
 {
-  (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
   SHIFT_TEMPS
   UNDIFFERENCE_2D(PREDICTOR6);
+  (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
 }
 
 METHODDEF(void)
@@ -156,9 +156,9 @@ jpeg_undifference7(j_decompress_ptr cinfo, int comp_index,
        JDIFFROW diff_buf, JDIFFROW prev_row,
        JDIFFROW undiff_buf, JDIMENSION width)
 {
-  (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
   SHIFT_TEMPS
   UNDIFFERENCE_2D(PREDICTOR7);
+  (void)cinfo;(void)comp_index;(void)diff_buf;(void)prev_row;(void)undiff_buf;(void)width;
 }
 
 
@@ -174,10 +174,10 @@ jpeg_undifference_first_row(j_decompress_ptr cinfo, int comp_index,
           JDIFFROW diff_buf, JDIFFROW prev_row,
           JDIFFROW undiff_buf, JDIMENSION width)
 {
-  (void)prev_row;
   j_lossless_d_ptr losslsd = (j_lossless_d_ptr) cinfo->codec;
 
   UNDIFFERENCE_1D(INITIAL_PREDICTORx);
+  (void)prev_row;
 
   /*
    * Now that we have undifferenced the first row, we want to use the

diff --git a/src/jpeg/libijg/jmorecfg.h b/src/jpeg/libijg/jmorecfg.h
index 443c6dda5cf0ba0f91b748ae3e81844af7083f0d..751ee6411acbc99a584587fd1a48c10cf605c2ca 100644 (file)
--- a/src/jpeg/libijg/jmorecfg.h
+++ b/src/jpeg/libijg/jmorecfg.h
@@ -20,7 +20,7 @@
  * We do not support run-time selection of data precision, sorry.
  */
 
-//#define BITS_IN_JSAMPLE  8  /* use 8 or 12 (or 16 only for lossless) */
+/*#define BITS_IN_JSAMPLE  8*//* use 8 or 12 (or 16 only for lossless) */
 #define BITS_IN_JSAMPLE @GDCM_BITS_IN_JSAMPLE@
 
 /*