walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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

This commit is contained in:
Mathieu Malaterre 2012-03-02 15:02:48 +00:00
parent 54c65fdad0
commit 79f090d92b
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libopenjpeg/jp2.c
View File

@ -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) { 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; 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 */ /* JP2 encoding */

2
libopenjpeg/phix_manager.c
View File

@ -88,6 +88,8 @@ int write_phixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_b
opj_packet_info_t packet; opj_packet_info_t packet;
int resno, precno, layno, num_packet; int resno, precno, layno, num_packet;
int numOfres, numOfprec, numOflayers; int numOfres, numOfprec, numOflayers;
packet.end_ph_pos = packet.start_pos = -1;
(void)EPHused; /* unused ? */
if( j2klen > pow( 2, 32)){ if( j2klen > pow( 2, 32)){
size_of_coding = 8; size_of_coding = 8;

3
libopenjpeg/ppix_manager.c
View File

@ -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? */ /* 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)); box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t));
for (i=0;i<2;i++){ 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; opj_packet_info_t packet;
int resno, precno, layno, num_packet; int resno, precno, layno, num_packet;
int numOfres, numOfprec, numOflayers; int numOfres, numOfprec, numOflayers;
packet.end_pos = packet.end_ph_pos = packet.start_pos = -1;
(void)EPHused; /* unused ? */
if( j2klen > pow( 2, 32)){ if( j2klen > pow( 2, 32)){
size_of_coding = 8; size_of_coding = 8;