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

2012-03-02 15:02:48 +00:00
parent 54c65fdad0
commit 79f090d92b
3 changed files with 6 additions and 0 deletions
--- 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 */