[trunk] Import change from 1.5 branch over to trunk

diff --git a/libopenjpeg/cidx_manager.c b/libopenjpeg/cidx_manager.c
index 4b1c242cfed5e5f69f88c0644b4cab5165be0e24..f3b251ffa09bf938ce8842c8e271ff56c852e871 100644 (file)
--- a/libopenjpeg/cidx_manager.c
+++ b/libopenjpeg/cidx_manager.c
@@ -71,7 +71,9 @@ int write_cidx( int offset, opj_cio_t *cio, opj_image_t *image, opj_codestream_i
   opj_jp2_box_t *box;
   int num_box = 0;
   opj_bool  EPHused;
+  (void)image; /* unused ? */
 
+  lenp = -1;
   box = (opj_jp2_box_t *)opj_calloc( 32, sizeof(opj_jp2_box_t));
 
   for (i=0;i<2;i++){