[trunk] merge r1197, r1199, r1228, r1230 and r1232 from branch 1.5 over to trunk

diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index f60e9e49b41dd3aa0559cd3c59c8faaf6005c45d..9ed7f5a0bd9bc78de043bbabd3dce47e53616eef 100644 (file)
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -1916,6 +1916,7 @@ void jp2_setup_encoder(opj_jp2_t *jp2, opj_cparameters_t *parameters, opj_image_
 opj_bool opj_jp2_encode(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
 
        int pos_iptr, pos_cidx, pos_jp2c, len_jp2c, len_cidx, end_pos, pos_fidx, len_fidx;
+       pos_jp2c = pos_iptr = -1; /* remove a warning */
 
        /* JP2 encoding */
 

diff --git a/libopenjpeg/phix_manager.c b/libopenjpeg/phix_manager.c
index 7d993c2e393123cd694b7c506100f01656796920..0e2e570499106f3f87033a144cae256f38ae3087 100644 (file)
--- a/libopenjpeg/phix_manager.c
+++ b/libopenjpeg/phix_manager.c
@@ -88,6 +88,8 @@ int write_phixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_b
   opj_packet_info_t packet;
   int resno, precno, layno, num_packet;
   int numOfres, numOfprec, numOflayers;
+  packet.end_ph_pos = packet.start_pos = -1;
+  (void)EPHused; /* unused ? */
 
   if( j2klen > pow( 2, 32)){
     size_of_coding =  8;

diff --git a/libopenjpeg/ppix_manager.c b/libopenjpeg/ppix_manager.c
index 8ce9f6da7621475c459a05b7e8f049163e73fd91..5afbbfd70e984e528778b2cc7fe90ec167616540 100644 (file)
--- a/libopenjpeg/ppix_manager.c
+++ b/libopenjpeg/ppix_manager.c
@@ -55,6 +55,7 @@ int write_ppix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int
 
   /*  printf("cstr_info.packno %d\n", cstr_info.packno); //NMAX? */
 
+  lenp = -1;
   box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t));
   
   for (i=0;i<2;i++){
@@ -89,6 +90,8 @@ int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_b
   opj_packet_info_t packet;
   int resno, precno, layno, num_packet;
   int numOfres, numOfprec, numOflayers;
+  packet.end_pos = packet.end_ph_pos = packet.start_pos = -1;
+  (void)EPHused; /* unused ? */
 
   if( j2klen > pow( 2, 32)){
     size_of_coding =  8;