Corrected the wrong syntax of calloc()...

[openjpeg.git] / libopenjpeg / openjpeg.c

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 78da551cf334c44bc41ba324b88c2f3e2a3ad898..af2ed6e6fcfc144f8c9f5bd87db6a400c9a53983 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -53,12 +53,12 @@ DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
 /* ---------------------------------------------------------------------- */
 
 
-const char* OPJ_CALLCONV opj_version() {
+const char* OPJ_CALLCONV opj_version(void) {
     return OPENJPEG_VERSION;
 }
 
 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) {
@@ -116,6 +116,7 @@ void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *paramete
                /* default decoding parameters */
                parameters->cp_layer = 0;
                parameters->cp_reduce = 0;
+               parameters->cp_limit_decoding = NO_LIMITATION;
 
                parameters->decod_format = -1;
                parameters->cod_format = -1;
@@ -147,25 +148,28 @@ void OPJ_CALLCONV opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *param
 }
 
 opj_image_t* OPJ_CALLCONV opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio) {
+       return opj_decode_with_info(dinfo, cio, NULL);
+}
+
+opj_image_t* OPJ_CALLCONV opj_decode_with_info(opj_dinfo_t *dinfo, opj_cio_t *cio, opj_codestream_info_t *cstr_info) {
        if(dinfo && cio) {
                switch(dinfo->codec_format) {
                        case CODEC_J2K:
-                               return j2k_decode((opj_j2k_t*)dinfo->j2k_handle, cio);
+                               return j2k_decode((opj_j2k_t*)dinfo->j2k_handle, cio, cstr_info);
                        case CODEC_JPT:
-                               return j2k_decode_jpt_stream((opj_j2k_t*)dinfo->j2k_handle, cio);
+                               return j2k_decode_jpt_stream((opj_j2k_t*)dinfo->j2k_handle, cio, cstr_info);
                        case CODEC_JP2:
-                               return jp2_decode((opj_jp2_t*)dinfo->jp2_handle, cio);
+                               return jp2_decode((opj_jp2_t*)dinfo->jp2_handle, cio, cstr_info);
                        case CODEC_UNKNOWN:
                        default:
                                break;
                }
        }
-
        return NULL;
 }
 
 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) {
@@ -202,10 +206,10 @@ void OPJ_CALLCONV opj_destroy_compress(opj_cinfo_t *cinfo) {
                /* destroy the codec */
                switch(cinfo->codec_format) {
                        case CODEC_J2K:
-                               j2k_destroy_decompress((opj_j2k_t*)cinfo->j2k_handle);
+                               j2k_destroy_compress((opj_j2k_t*)cinfo->j2k_handle);
                                break;
                        case CODEC_JP2:
-                               jp2_destroy_decompress((opj_jp2_t*)cinfo->jp2_handle);
+                               jp2_destroy_compress((opj_jp2_t*)cinfo->jp2_handle);
                                break;
                        case CODEC_JPT:
                        case CODEC_UNKNOWN:
@@ -221,14 +225,17 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete
        if(parameters) {
                memset(parameters, 0, sizeof(opj_cparameters_t));
                /* default coding parameters */
+               parameters->cp_cinema = OFF; 
+               parameters->max_comp_size = 0;
                parameters->numresolution = 6;
+               parameters->cp_rsiz = STD_RSIZ;
                parameters->cblockw_init = 64;
                parameters->cblockh_init = 64;
                parameters->prog_order = LRCP;
                parameters->roi_compno = -1;            /* no ROI */
                parameters->subsampling_dx = 1;
                parameters->subsampling_dy = 1;
-
+               parameters->tp_on = 0;
                parameters->decod_format = -1;
                parameters->cod_format = -1;
 /* UniPG>> */
@@ -261,7 +268,7 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete
                                parameters->jpwl_sens_TPH[i] = -1; /* absent */
                        }
                };
-#endif USE_JPWL
+#endif /* USE_JPWL */
 /* <<UniPG */
        }
 }
@@ -284,20 +291,39 @@ void OPJ_CALLCONV opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *param
 }
 
 bool OPJ_CALLCONV opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, char *index) {
+       if (index != NULL)
+               opj_event_msg((opj_common_ptr)cinfo, EVT_WARNING, "Set index to NULL when calling the opj_encode function.\n"
+               "To extract the index, use the opj_encode_with_info() function.\n"
+               "No index will be generated during this encoding\n");
+       return opj_encode_with_info(cinfo, cio, image, NULL);
+}
+
+bool OPJ_CALLCONV opj_encode_with_info(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
        if(cinfo && cio && image) {
                switch(cinfo->codec_format) {
                        case CODEC_J2K:
-                               return j2k_encode((opj_j2k_t*)cinfo->j2k_handle, cio, image, index);
+                               return j2k_encode((opj_j2k_t*)cinfo->j2k_handle, cio, image, cstr_info);
                        case CODEC_JP2:
-                               return jp2_encode((opj_jp2_t*)cinfo->jp2_handle, cio, image, index);
+                               return jp2_encode((opj_jp2_t*)cinfo->jp2_handle, cio, image, cstr_info);
                        case CODEC_JPT:
                        case CODEC_UNKNOWN:
                        default:
                                break;
                }
        }
-
        return false;
 }
 
-
+void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_t *cstr_info) {
+       if (cstr_info) {
+               int tileno;
+               for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
+                       opj_tile_info_t *tile_info = &cstr_info->tile[tileno];
+                       opj_free(tile_info->thresh);
+                       opj_free(tile_info->packet);
+                       opj_free(tile_info->tp);
+               }
+               opj_free(cstr_info->tile);
+               opj_free(cstr_info->marker);
+       }
+}