Aligned malloc using Intel's _mm_malloc(), cleanup on the t1 memory allocation, getti...

[openjpeg.git] / libopenjpeg / openjpeg.c

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 78da551cf334c44bc41ba324b88c2f3e2a3ad898..f7363b9b8f5175546baa389f70d0826a50598d1d 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -53,7 +53,7 @@ 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;
 }
 
@@ -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;
@@ -221,14 +222,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 +265,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 */
        }
 }