diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-02 15:02:48 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-02 15:02:48 +0000 |
| commit | 79f090d92b294165ba33998b79be61c8ff64e52c (patch) | |
| tree | d3bcb49d13891a564056e6f49952b3b957cad30e | |
| parent | 54c65fdad05bddc51df7a323cde1dc529bf14577 (diff) | |
[trunk] merge r1197, r1199, r1228, r1230 and r1232 from branch 1.5 over to trunk
| -rw-r--r-- | libopenjpeg/jp2.c | 1 | ||||
| -rw-r--r-- | libopenjpeg/phix_manager.c | 2 | ||||
| -rw-r--r-- | libopenjpeg/ppix_manager.c | 3 |
3 files changed, 6 insertions, 0 deletions
diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index f60e9e49..9ed7f5a0 100644 --- 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 7d993c2e..0e2e5704 100644 --- 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 8ce9f6da..5afbbfd7 100644 --- 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; |