[trunk] remove warnings raised by flags -Wall -Wextra -pedantic and vs9 analyzer

diff --git a/src/lib/openjp2/invert.c b/src/lib/openjp2/invert.c
index 30651ba3276ca0002170871fcd2f2ec5fee0f1b5..b05fabd4f82abf37c0c0bbb8248408d81f8614d0 100644 (file)
--- a/src/lib/openjp2/invert.c
+++ b/src/lib/openjp2/invert.c
@@ -32,7 +32,7 @@
 static opj_bool opj_lupDecompose(OPJ_FLOAT32 * matrix,
                                  OPJ_UINT32 * permutations, 
                                  OPJ_FLOAT32 * p_swap_area,
-                                 OPJ_UINT32 n);
+                                 OPJ_UINT32 nb_compo);
 /** 
  * LUP solving
  */
@@ -40,7 +40,7 @@ static void opj_lupSolve(OPJ_FLOAT32 * pResult,
                          OPJ_FLOAT32* pMatrix, 
                          OPJ_FLOAT32* pVector, 
                          OPJ_UINT32* pPermutations, 
-                         OPJ_UINT32 n,
+                         OPJ_UINT32 nb_compo,
                          OPJ_FLOAT32 * p_intermediate_data);
 
 /** 
@@ -48,7 +48,7 @@ static void opj_lupSolve(OPJ_FLOAT32 * pResult,
  */
 static void opj_lupInvert ( OPJ_FLOAT32 * pSrcMatrix,
                             OPJ_FLOAT32 * pDestMatrix,
-                            OPJ_UINT32 n,
+                            OPJ_UINT32 nb_compo,
                             OPJ_UINT32 * pPermutations,
                             OPJ_FLOAT32 * p_src_temp,
                             OPJ_FLOAT32 * p_dest_temp,
@@ -64,11 +64,11 @@ static void opj_lupInvert ( OPJ_FLOAT32 * pSrcMatrix,
  */
 opj_bool opj_matrix_inversion_f(OPJ_FLOAT32 * pSrcMatrix,
                                 OPJ_FLOAT32 * pDestMatrix, 
-                                OPJ_UINT32 n)
+                                OPJ_UINT32 nb_compo)
 {
        OPJ_BYTE * l_data = 00;
-       OPJ_UINT32 l_permutation_size = n * sizeof(OPJ_UINT32);
-       OPJ_UINT32 l_swap_size = n * sizeof(OPJ_FLOAT32);
+       OPJ_UINT32 l_permutation_size = nb_compo * sizeof(OPJ_UINT32);
+       OPJ_UINT32 l_swap_size = nb_compo * sizeof(OPJ_FLOAT32);
        OPJ_UINT32 l_total_size = l_permutation_size + 3 * l_swap_size;
        OPJ_UINT32 * lPermutations = 00;
        OPJ_FLOAT32 * l_double_data = 00;
@@ -81,12 +81,12 @@ opj_bool opj_matrix_inversion_f(OPJ_FLOAT32 * pSrcMatrix,
        l_double_data = (OPJ_FLOAT32 *) (l_data + l_permutation_size);
        memset(lPermutations,0,l_permutation_size);
 
-       if(! opj_lupDecompose(pSrcMatrix,lPermutations,l_double_data,n)) {
+       if(! opj_lupDecompose(pSrcMatrix,lPermutations,l_double_data,nb_compo)) {
                opj_free(l_data);
                return OPJ_FALSE;
        }
        
-    opj_lupInvert(pSrcMatrix,pDestMatrix,n,lPermutations,l_double_data,l_double_data + n,l_double_data + 2*n);
+    opj_lupInvert(pSrcMatrix,pDestMatrix,nb_compo,lPermutations,l_double_data,l_double_data + nb_compo,l_double_data + 2*nb_compo);
        opj_free(l_data);
        
     return OPJ_TRUE;
@@ -100,7 +100,7 @@ opj_bool opj_matrix_inversion_f(OPJ_FLOAT32 * pSrcMatrix,
 */
 opj_bool opj_lupDecompose(OPJ_FLOAT32 * matrix,OPJ_UINT32 * permutations, 
                           OPJ_FLOAT32 * p_swap_area,
-                          OPJ_UINT32 n) 
+                          OPJ_UINT32 nb_compo) 
 {
        OPJ_UINT32 * tmpPermutations = permutations;
        OPJ_UINT32 * dstPermutations;
@@ -108,15 +108,15 @@ opj_bool opj_lupDecompose(OPJ_FLOAT32 * matrix,OPJ_UINT32 * permutations,
        OPJ_FLOAT32 temp;
        OPJ_UINT32 i,j,k;
        OPJ_FLOAT32 p;
-       OPJ_UINT32 lLastColum = n - 1;
-       OPJ_UINT32 lSwapSize = n * sizeof(OPJ_FLOAT32);
+       OPJ_UINT32 lLastColum = nb_compo - 1;
+       OPJ_UINT32 lSwapSize = nb_compo * sizeof(OPJ_FLOAT32);
        OPJ_FLOAT32 * lTmpMatrix = matrix;
        OPJ_FLOAT32 * lColumnMatrix,* lDestMatrix;
        OPJ_UINT32 offset = 1;
-       OPJ_UINT32 lStride = n-1;
+       OPJ_UINT32 lStride = nb_compo-1;
 
        /*initialize permutations */
-       for (i = 0; i < n; ++i) 
+       for (i = 0; i < nb_compo; ++i) 
        {
        *tmpPermutations++ = i;
        }
@@ -129,14 +129,14 @@ opj_bool opj_lupDecompose(OPJ_FLOAT32 * matrix,OPJ_UINT32 * permutations,
                lColumnMatrix = lTmpMatrix + k;
                
                /* make permutation with the biggest value in the column */
-        for (i = k; i < n; ++i) {
+        for (i = k; i < nb_compo; ++i) {
                        temp = ((*lColumnMatrix > 0) ? *lColumnMatrix : -(*lColumnMatrix));
                if (temp > p) {
                        p = temp;
                        k2 = i;
                }
                        /* next line */
-                       lColumnMatrix += n;
+                       lColumnMatrix += nb_compo;
        }
 
        /* a whole rest of 0 -> non singular */
@@ -155,7 +155,7 @@ opj_bool opj_lupDecompose(OPJ_FLOAT32 * matrix,OPJ_UINT32 * permutations,
                *dstPermutations = t;
 
                        /* and swap entire line. */
-                       lColumnMatrix = lTmpMatrix + (k2 - k) * n;
+                       lColumnMatrix = lTmpMatrix + (k2 - k) * nb_compo;
                        memcpy(p_swap_area,lColumnMatrix,lSwapSize);
                        memcpy(lColumnMatrix,lTmpMatrix,lSwapSize);
                        memcpy(lTmpMatrix,p_swap_area,lSwapSize);
@@ -163,12 +163,12 @@ opj_bool opj_lupDecompose(OPJ_FLOAT32 * matrix,OPJ_UINT32 * permutations,
 
                /* now update data in the rest of the line and line after */
                lDestMatrix = lTmpMatrix + k;
-               lColumnMatrix = lDestMatrix + n;
+               lColumnMatrix = lDestMatrix + nb_compo;
                /* take the middle element */
                temp = *(lDestMatrix++);
 
                /* now compute up data (i.e. coeff up of the diagonal). */
-       for (i = offset; i < n; ++i)  {
+       for (i = offset; i < nb_compo; ++i)  {
                        /*lColumnMatrix; */
                        /* divide the lower column elements by the diagonal value */
 
@@ -177,7 +177,7 @@ opj_bool opj_lupDecompose(OPJ_FLOAT32 * matrix,OPJ_UINT32 * permutations,
                        p = *lColumnMatrix / temp;
                        *(lColumnMatrix++) = p;
                
-            for (j = /* k + 1 */ offset; j < n; ++j) {
+            for (j = /* k + 1 */ offset; j < nb_compo; ++j) {
                                /* matrix[i][j] -= matrix[i][k] * matrix[k][j]; */
                        *(lColumnMatrix++) -= p * (*(lDestMatrix++));
                        }
@@ -192,7 +192,7 @@ opj_bool opj_lupDecompose(OPJ_FLOAT32 * matrix,OPJ_UINT32 * permutations,
                /* 1 element less for stride */
                --lStride;
                /* next line */
-               lTmpMatrix+=n;
+               lTmpMatrix+=nb_compo;
                /* next permutation element */
                ++tmpPermutations;
        }
@@ -203,26 +203,27 @@ void opj_lupSolve (OPJ_FLOAT32 * pResult,
                    OPJ_FLOAT32 * pMatrix, 
                    OPJ_FLOAT32 * pVector, 
                    OPJ_UINT32* pPermutations, 
-                   OPJ_UINT32 n,OPJ_FLOAT32 * p_intermediate_data) 
+                   OPJ_UINT32 nb_compo,OPJ_FLOAT32 * p_intermediate_data) 
 {
-       OPJ_UINT32 i,j;
+       OPJ_INT32 k;
+    OPJ_UINT32 i,j;
        OPJ_FLOAT32 sum;
        OPJ_FLOAT32 u;
-    OPJ_UINT32 lStride = n+1;
+    OPJ_UINT32 lStride = nb_compo+1;
        OPJ_FLOAT32 * lCurrentPtr;
        OPJ_FLOAT32 * lIntermediatePtr;
        OPJ_FLOAT32 * lDestPtr;
        OPJ_FLOAT32 * lTmpMatrix;
        OPJ_FLOAT32 * lLineMatrix = pMatrix;
-       OPJ_FLOAT32 * lBeginPtr = pResult + n - 1;
+       OPJ_FLOAT32 * lBeginPtr = pResult + nb_compo - 1;
        OPJ_FLOAT32 * lGeneratedData;
        OPJ_UINT32 * lCurrentPermutationPtr = pPermutations;
 
        
        lIntermediatePtr = p_intermediate_data;
-       lGeneratedData = p_intermediate_data + n - 1;
+       lGeneratedData = p_intermediate_data + nb_compo - 1;
        
-    for (i = 0; i < n; ++i) {
+    for (i = 0; i < nb_compo; ++i) {
                sum = 0.0;
                lCurrentPtr = p_intermediate_data;
                lTmpMatrix = lLineMatrix;
@@ -233,25 +234,27 @@ void opj_lupSolve (OPJ_FLOAT32 * pResult,
         }
                /*y[i] = pVector[pPermutations[i]] - sum; */
         *(lIntermediatePtr++) = pVector[*(lCurrentPermutationPtr++)] - sum;
-               lLineMatrix += n;
+               lLineMatrix += nb_compo;
        }
 
        /* we take the last point of the matrix */
-       lLineMatrix = pMatrix + n*n - 1;
+       lLineMatrix = pMatrix + nb_compo*nb_compo - 1;
 
        /* and we take after the last point of the destination vector */
-       lDestPtr = pResult + n;
+       lDestPtr = pResult + nb_compo;
 
-       for (i = n - 1; i != -1 ; --i) {
+
+    assert(nb_compo != 0);
+       for (k = (OPJ_INT32)nb_compo - 1; k != -1 ; --k) {
                sum = 0.0;
                lTmpMatrix = lLineMatrix;
         u = *(lTmpMatrix++);
                lCurrentPtr = lDestPtr--;
-        for (j = i + 1; j < n; ++j) {
-                       /* sum += matrix[i][j] * x[j] */
+        for (j = k + 1; j < nb_compo; ++j) {
+                       /* sum += matrix[k][j] * x[j] */
                sum += (*(lTmpMatrix++)) * (*(lCurrentPtr++));
                }
-               /*x[i] = (y[i] - sum) / u; */
+               /*x[k] = (y[k] - sum) / u; */
         *(lBeginPtr--) = (*(lGeneratedData--) - sum) / u;
                lLineMatrix -= lStride;
        }
@@ -260,7 +263,7 @@ void opj_lupSolve (OPJ_FLOAT32 * pResult,
 
 void opj_lupInvert (OPJ_FLOAT32 * pSrcMatrix,
                     OPJ_FLOAT32 * pDestMatrix,
-                    OPJ_UINT32 n,
+                    OPJ_UINT32 nb_compo,
                     OPJ_UINT32 * pPermutations,
                     OPJ_FLOAT32 * p_src_temp,
                     OPJ_FLOAT32 * p_dest_temp,
@@ -269,17 +272,17 @@ void opj_lupInvert (OPJ_FLOAT32 * pSrcMatrix,
        OPJ_UINT32 j,i;
        OPJ_FLOAT32 * lCurrentPtr;
        OPJ_FLOAT32 * lLineMatrix = pDestMatrix;
-       OPJ_UINT32 lSwapSize = n * sizeof(OPJ_FLOAT32);
+       OPJ_UINT32 lSwapSize = nb_compo * sizeof(OPJ_FLOAT32);
 
-       for (j = 0; j < n; ++j) {
+       for (j = 0; j < nb_compo; ++j) {
                lCurrentPtr = lLineMatrix++;
         memset(p_src_temp,0,lSwapSize);
        p_src_temp[j] = 1.0;
-               opj_lupSolve(p_dest_temp,pSrcMatrix,p_src_temp, pPermutations, n , p_swap_area);
+               opj_lupSolve(p_dest_temp,pSrcMatrix,p_src_temp, pPermutations, nb_compo , p_swap_area);
 
-               for (i = 0; i < n; ++i) {
+               for (i = 0; i < nb_compo; ++i) {
                *(lCurrentPtr) = p_dest_temp[i];
-                       lCurrentPtr+=n;
+                       lCurrentPtr+=nb_compo;
        }
     }
 }

diff --git a/src/lib/openjp2/invert.h b/src/lib/openjp2/invert.h
index c943ae30c0f9aca31b449e1f8d7a0576a0c38ab6..665a4d166b5a71297063e77db37e95b63b591d12 100644 (file)
--- a/src/lib/openjp2/invert.h
+++ b/src/lib/openjp2/invert.h
@@ -50,7 +50,7 @@ The function in INVERT.H compute a matrix inversion with a LUP method
  */
 opj_bool opj_matrix_inversion_f(OPJ_FLOAT32 * pSrcMatrix,
                                 OPJ_FLOAT32 * pDestMatrix, 
-                                OPJ_UINT32 n);
+                                OPJ_UINT32 nb_compo);
 /* ----------------------------------------------------------------------- */
 /*@}*/
 

diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
index d95c6f4a3dbfe6aaab88684352c518b41927b5b1..47f9601ef6c9e5d6c87e9d8161f262a63dbe51f3 100644 (file)
--- a/src/lib/openjp2/j2k.c
+++ b/src/lib/openjp2/j2k.c
@@ -2418,10 +2418,10 @@ opj_bool opj_j2k_write_coc( opj_j2k_t *p_j2k,
 
         if (l_coc_size > p_j2k->m_specific_param.m_encoder.m_header_tile_data_size) {
                 OPJ_BYTE *new_header_tile_data;
-                p_j2k->m_specific_param.m_encoder.m_header_tile_data
+                /*p_j2k->m_specific_param.m_encoder.m_header_tile_data
                         = (OPJ_BYTE*)opj_realloc(
                                 p_j2k->m_specific_param.m_encoder.m_header_tile_data,
-                                l_coc_size);
+                                l_coc_size);*/
 
                 new_header_tile_data = (OPJ_BYTE *) opj_realloc(p_j2k->m_specific_param.m_encoder.m_header_tile_data, l_coc_size);
                 if (! new_header_tile_data) {

diff --git a/src/lib/openjp2/phix_manager.c b/src/lib/openjp2/phix_manager.c
index 7bb7fe98bcaf45beb74442dc9573132167c9ba4a..269cea00ab01b239723e737d9824da2ffb02dee4 100644 (file)
--- a/src/lib/openjp2/phix_manager.c
+++ b/src/lib/openjp2/phix_manager.c
@@ -54,7 +54,7 @@ int opj_write_phix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused,
   OPJ_BYTE l_data_header [8];
   int len, compno, i;
   opj_jp2_box_t *box;
-  OPJ_OFF_T lenp;
+  OPJ_OFF_T lenp = 0;
 
   box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t));
   

diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c
index b99984fecce96a142c76e6a93bd58e0d65ac9739..e97679168e8fa45892f84ff4cdf2b98742993895 100644 (file)
--- a/src/lib/openjp2/pi.c
+++ b/src/lib/openjp2/pi.c
@@ -1281,11 +1281,10 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image,
        }
        ++l_current_pi;
 
-       for
-               (pino = 1 ; pino<l_bound ; ++pino )
+       for (pino = 1 ; pino<l_bound ; ++pino )
        {
-               opj_pi_comp_t *l_current_comp = l_current_pi->comps;
-               opj_image_comp_t * l_img_comp = p_image->comps;
+               l_current_comp = l_current_pi->comps;
+               l_img_comp = p_image->comps;
                l_tccp = l_tcp->tccps;
 
                l_current_pi->tx0 = l_tx0;
@@ -1475,8 +1474,8 @@ opj_pi_iterator_t *opj_pi_initialise_encode(const opj_image_t *p_image,
        ++l_current_pi;
 
        for (pino = 1 ; pino<l_bound ; ++pino ) {
-               opj_pi_comp_t *l_current_comp = l_current_pi->comps;
-               opj_image_comp_t * l_img_comp = p_image->comps;
+               l_current_comp = l_current_pi->comps;
+               l_img_comp = p_image->comps;
                l_tccp = l_tcp->tccps;
 
                l_current_pi->tx0 = l_tx0;

diff --git a/src/lib/openjp2/t1.c b/src/lib/openjp2/t1.c
index 8b33dc4ab38eed347ffe8b3939c7991bd5cebb8e..09ae1cd835320ba147f8089c3911f0fb476edac0 100644 (file)
--- a/src/lib/openjp2/t1.c
+++ b/src/lib/openjp2/t1.c
@@ -1622,7 +1622,7 @@ void opj_t1_encode_cblk(opj_t1_t *t1,
                        pass->term = 1;
                } else {
                        if (((bpno < ((OPJ_INT32) (cblk->numbps) - 4) && (passtype > 0))
-                               || ((bpno == (cblk->numbps - 4)) && (passtype == 2))) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) {
+                               || ((bpno == ((OPJ_INT32)cblk->numbps - 4)) && (passtype == 2))) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) {
                                if (type == T1_TYPE_RAW) {
                                        opj_mqc_flush(mqc);
                                        correction = 1;

diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c
index dc09409812bd8353d2802673915eb5e1cc0ac5ea..c783af3dbcfe0cc7bc84c3f4832c4c565400081a 100644 (file)
--- a/src/lib/openjp2/t2.c
+++ b/src/lib/openjp2/t2.c
@@ -327,11 +327,15 @@ opj_bool opj_t2_decode_packets( opj_t2_t *p_t2,
         OPJ_UINT32 l_nb_bytes_read;
         OPJ_UINT32 l_nb_pocs = l_tcp->numpocs + 1;
         opj_pi_iterator_t *l_current_pi = 00;
+#ifdef TODO_MSD
         OPJ_UINT32 curtp = 0;
+#endif 
         OPJ_UINT32 tp_start_packno;
         opj_packet_info_t *l_pack_info = 00;
         opj_image_comp_t* l_img_comp = 00;
 
+        OPJ_ARG_NOT_USED(p_cstr_index);
+
 #ifdef TODO_MSD
         if (p_cstr_index) {
                 l_pack_info = p_cstr_index->tile_index[p_tile_no].packet;
@@ -558,7 +562,7 @@ opj_bool opj_t2_encode_packet(  OPJ_UINT32 tileno,
 
                         l_nb_blocks = prc->cw * prc->ch;
                         for     (cblkno = 0; cblkno < l_nb_blocks; ++cblkno) {
-                                opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
+                                cblk = &prc->cblks.enc[cblkno];
 
                                 cblk->numpasses = 0;
                                 opj_tgt_setvalue(prc->imsbtree, cblkno, band->numbps - cblk->numbps);
@@ -1043,6 +1047,9 @@ opj_bool opj_t2_read_packet_data(   opj_t2_t* p_t2,
         opj_tcd_cblk_dec_t* l_cblk = 00;
         opj_tcd_resolution_t* l_res = &p_tile->comps[p_pi->compno].resolutions[p_pi->resno];
 
+        OPJ_ARG_NOT_USED(p_t2);
+        OPJ_ARG_NOT_USED(pack_info);
+
         l_band = l_res->bands;
         for (bandno = 0; bandno < l_res->numbands; ++bandno) {
                 opj_tcd_precinct_t *l_prc = &l_band->precincts[p_pi->precno];
@@ -1153,6 +1160,9 @@ opj_bool opj_t2_skip_packet_data(   opj_t2_t* p_t2,
         opj_tcd_cblk_dec_t* l_cblk = 00;
         opj_tcd_resolution_t* l_res = &p_tile->comps[p_pi->compno].resolutions[p_pi->resno];
 
+        OPJ_ARG_NOT_USED(p_t2);
+        OPJ_ARG_NOT_USED(pack_info);
+
         *p_data_read = 0;
         l_band = l_res->bands;