[trunk] correct wrong input in dump_codec function and add missing return value

diff --git a/CHANGES b/CHANGES
index ef65fd37ab7d62cfee18c0439dfa899d11b9cdb0..32160b439756b10f5618a4f35d90c02e1176b6b5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ What's New for OpenJPEG
 + : added
 
 October 07, 2011
+* [mickael] WIP: correct wrong input in dump_codec function and add missing return value
 * [mickael] WIP: correct mistake inside set_decoded_area function (credit to Francois De Vieilleville)
 + [mickael] WIP: backport rev 967-969 from opj-1.5 to trunk about test suite enhancement and rename of opj_configh.cmake.in
 

diff --git a/applications/codec/j2k_dump.c b/applications/codec/j2k_dump.c
index e0a2c00cfa785c9e7b2844f0b9e7b5e16690c428..5b0bf878fbf72d59c5bbfd4f8d5c873421c19f90 100644 (file)
--- a/applications/codec/j2k_dump.c
+++ b/applications/codec/j2k_dump.c
@@ -516,7 +516,7 @@ int main(int argc, char *argv[])
                        return EXIT_FAILURE;
                }
 
-               opj_dump_codec(dinfo, OPJ_IMG_INFO | OPJ_J2K_MH_INFO | OPJ_J2K_MH_IND, stdout );
+               opj_dump_codec(dinfo, OPJ_IMG_INFO | OPJ_J2K_MH_INFO | OPJ_J2K_MH_IND, fout );
 
                cstr_info = opj_get_cstr_info(dinfo);
 

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 4516c567c4e315589c59558614898c0bdb2f1287..32b6d544cfe22d64edf488c1b2b8f7c82498edde 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -883,9 +883,11 @@ void OPJ_CALLCONV opj_dump_codec(  opj_codec_t *p_codec,
                opj_codec_private_t* l_codec = (opj_codec_private_t*) p_codec;
 
                l_codec->opj_dump_codec(l_codec->m_codec, info_flag, output_stream);
+               return;
        }
 
        fprintf(stderr, "[ERROR] Input parameter of the dump_codec function are incorrect.\n");
+       return;
 }
 
 /*