Change CMakeLists.txt to build examples by default (image_to_j2k and j2k_to_image).

[openjpeg.git] / libopenjpeg / openjpeg.c

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 356d2ca9e6a841266dca2168ff796612e8628e87..565c5caa0fff8b5d0d718ed06655425b6def35a8 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -58,7 +58,7 @@ const char* OPJ_CALLCONV opj_version(void) {
 }
 
 opj_dinfo_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format) {
-       opj_dinfo_t *dinfo = (opj_dinfo_t*)opj_malloc(sizeof(opj_dinfo_t));
+       opj_dinfo_t *dinfo = (opj_dinfo_t*)opj_calloc(1, sizeof(opj_dinfo_t));
        if(!dinfo) return NULL;
        dinfo->is_decompressor = true;
        switch(format) {
@@ -169,7 +169,7 @@ opj_image_t* OPJ_CALLCONV opj_decode_with_info(opj_dinfo_t *dinfo, opj_cio_t *ci
 }
 
 opj_cinfo_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format) {
-       opj_cinfo_t *cinfo = (opj_cinfo_t*)opj_malloc(sizeof(opj_cinfo_t));
+       opj_cinfo_t *cinfo = (opj_cinfo_t*)opj_calloc(1, sizeof(opj_cinfo_t));
        if(!cinfo) return NULL;
        cinfo->is_decompressor = false;
        switch(format) {
@@ -238,6 +238,12 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete
                parameters->tp_on = 0;
                parameters->decod_format = -1;
                parameters->cod_format = -1;
+               parameters->tcp_rates[0] = 0;   
+               parameters->tcp_numlayers = 0;
+    parameters->cp_disto_alloc = 0;
+               parameters->cp_fixed_alloc = 0;
+               parameters->cp_fixed_quality = 0;
+
 /* UniPG>> */
 #ifdef USE_JPWL
                parameters->jpwl_epc_on = false;
@@ -324,5 +330,7 @@ void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_t *cstr_info) {
                        opj_free(tile_info->tp);
                }
                opj_free(cstr_info->tile);
+               opj_free(cstr_info->marker);
+               opj_free(cstr_info->numdecompos);
        }
 }