[trunk] Set of warnings fix for gcc -pedantic

[openjpeg.git] / src / lib / openjp3d / t1_3d.c

diff --git a/src/lib/openjp3d/t1_3d.c b/src/lib/openjp3d/t1_3d.c
index efdf2efcf5f45d927cec2f1c9aac1527bf4d6d96..2403824260f0ae63747ff7f2c450cd86cb665271 100755 (executable)
--- a/src/lib/openjp3d/t1_3d.c
+++ b/src/lib/openjp3d/t1_3d.c
@@ -132,7 +132,7 @@ static int t1_3d_getctxno_zc(unsigned int f, int orient) {
 \r
 static int t1_3d_getctxno_sc(unsigned int f) {\r
        return t1_3d_init_ctxno_sc((f & T1_3D_SIG_PRIM) | ((f >> 16) & T1_3D_SGN));\r
-       //return t1->lut_ctxno_sc[((f & T1_3D_SIG_PRIM) | ((f >> 16) & T1_3D_SGN)) >> 4];\r
+       /*return t1->lut_ctxno_sc[((f & T1_3D_SIG_PRIM) | ((f >> 16) & T1_3D_SGN)) >> 4];*/\r
 }\r
 \r
 static int t1_3d_getctxno_mag(unsigned int f, int fsvr) {\r
@@ -141,7 +141,7 @@ static int t1_3d_getctxno_mag(unsigned int f, int fsvr) {
 \r
 static int t1_3d_getspb(unsigned int f) {\r
        return t1_3d_init_spb((f & T1_3D_SIG_PRIM) | ((f >> 16) & T1_3D_SGN));\r
-       //return t1->lut_spb[((f & T1_3D_SIG_PRIM) | ((f >> 16) & T1_3D_SGN)) >> 4];\r
+       /*return t1->lut_spb[((f & T1_3D_SIG_PRIM) | ((f >> 16) & T1_3D_SGN)) >> 4];*/\r
 }\r
 \r
 static int t1_3d_getnmsedec_sig(opj_t1_3d_t *t1, int x, int bitpos) {\r
@@ -773,8 +773,8 @@ static int t1_3d_init_ctxno_zc(unsigned int f, int orient) {
                + ((f & T1_3D_SIG_BNW) != 0) + ((f & T1_3D_SIG_BNE) != 0) + ((f & T1_3D_SIG_BSE) != 0) + ((f & T1_3D_SIG_BSW) != 0);\r
        \r
        switch (orient) {\r
-               case 0: //LLL\r
-               case 7: //HHH\r
+               case 0: /*LLL*/\r
+               case 7: /*HHH*/\r
                        hvc = h + v + c;\r
                        d2 = d2xy + d2xz + d2yz;\r
                        if (!hvc) {\r
@@ -805,7 +805,7 @@ static int t1_3d_init_ctxno_zc(unsigned int f, int orient) {
                                n = 15;\r
                        }\r
                        break;\r
-               //LHL, HLL, LLH\r
+               /*LHL, HLL, LLH*/\r
                case 1:\r
                case 2:\r
                case 4:\r
@@ -817,19 +817,19 @@ static int t1_3d_init_ctxno_zc(unsigned int f, int orient) {
                                                n = (!d2xy2yz) ? ((!d3) ? 0 : 1) : ((!d3) ? 2 : 3);     \r
                                        } else if (d2xy == 1) {\r
                                                n = (!d2xy2yz) ? ((!d3) ? 4 : 5) : 6;   \r
-                                       } else { //>=2\r
+                                       } else { /*>=2*/\r
                         n = 7;\r
                                        }\r
                                } else {\r
-                                       n = (v == 1) ? 8 : 9; // =1 or =2\r
+                                       n = (v == 1) ? 8 : 9; /* =1 or =2*/\r
                                } \r
                        } else if (hc == 1) {\r
                                n = (!v) ? ( (!d2xy) ? ( (!d2xy2yz) ? ( (!d3) ? 10 : 11) : (12) ) : (13) ) : (14);\r
-                       } else { //if (hc >= 2)\r
+                       } else { /*if (hc >= 2)*/\r
                                n = 15;\r
                        }\r
                        break;\r
-               //HLH, HHL, LHH\r
+               /*HLH, HHL, LHH*/\r
                case 3:\r
                case 5:\r
                case 6:\r
@@ -841,7 +841,7 @@ static int t1_3d_init_ctxno_zc(unsigned int f, int orient) {
                                                n = (!d3) ? 0 : 1;\r
                                        } else if (hc == 1) {\r
                                                n = (!d2xy2xz) ?  2 : 3;\r
-                                       } else { //if >= 2\r
+                                       } else { /*if >= 2*/\r
                                                n = 4;\r
                                        }\r
                                } else if ( d2xz>=1 && !hc ) {\r
@@ -856,7 +856,7 @@ static int t1_3d_init_ctxno_zc(unsigned int f, int orient) {
                                        n = (!hc) ? 10 : 11;\r
                                } else if (d2xz == 2) {\r
                                        n = (!hc) ? 12 : 13;\r
-                               } else { // if (d2xz >= 3) {\r
+                               } else { /* if (d2xz >= 3) {*/\r
                                        n = 14;\r
                                }\r
                        } else if (v == 2) {\r
@@ -920,7 +920,7 @@ static int t1_3d_init_ctxno_sc(unsigned int f) {
 \r
 static int t1_3d_init_ctxno_mag(unsigned int f, int f2) {\r
        int n;\r
-       if (!(f2 & T1_3D_REFINE))       //First refinement for this coefficient (no previous refinement)\r
+       if (!(f2 & T1_3D_REFINE))       /*First refinement for this coefficient (no previous refinement)*/\r
                n = (f & (T1_3D_SIG_PRIM)) ? 1 : 0;\r
        else\r
                n = 2;\r
@@ -1137,7 +1137,7 @@ void t1_3d_decode_cblks(opj_t1_3d_t *t1, opj_tcd_tile_t *tile, opj_tcp_t *tcp) {
 \r
                                                orient = band->bandno;  /* FIXME */\r
 \r
-                                               //fprintf(stdout,"[INFO] t1_3d_decode_cblk(t1, cblk, orient(%d), tcp->tccps[compno].roishift (%d), tcp->tccps[compno].cblksty (%d));\n",orient,tcp->tccps[compno].roishift, tcp->tccps[compno].cblksty);\r
+                                               /*fprintf(stdout,"[INFO] t1_3d_decode_cblk(t1, cblk, orient(%d), tcp->tccps[compno].roishift (%d), tcp->tccps[compno].cblksty (%d));\n",orient,tcp->tccps[compno].roishift, tcp->tccps[compno].cblksty);*/\r
                                                t1_3d_decode_cblk(t1, cblk, orient, tcp->tccps[compno].roishift, tcp->tccps[compno].cblksty);\r
 \r
                                                if (band->bandno == 0) {\r