From 3ce9af7fce87e34d210e31216288df8f6990e1b7 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 9 Aug 2012 15:04:09 +0000 Subject: [PATCH] remove deprecated v1 style function j2k_setup_decoder --- libopenjpeg/j2k.c | 19 ------------------- libopenjpeg/j2k.h | 2 -- 2 files changed, 21 deletions(-) diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index b93d37ef..5166ce8f 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -7673,25 +7673,6 @@ void j2k_destroy_decompress(opj_j2k_t *j2k) { opj_free(j2k); } -void j2k_setup_decoder(opj_j2k_t *j2k, opj_dparameters_t *parameters) { - if(j2k && parameters) { - /* create and initialize the coding parameters structure */ - opj_cp_t *cp = (opj_cp_t*) opj_calloc(1, sizeof(opj_cp_t)); - cp->reduce = parameters->cp_reduce; - cp->layer = parameters->cp_layer; - cp->limit_decoding = parameters->cp_limit_decoding; - -#ifdef USE_JPWL - cp->correct = parameters->jpwl_correct; - cp->exp_comps = parameters->jpwl_exp_comps; - cp->max_tiles = parameters->jpwl_max_tiles; -#endif /* USE_JPWL */ - - - /* keep a link to cp so that we can destroy it later in j2k_destroy_decompress */ - j2k->cp = cp; - } -} void j2k_setup_decoder_v2(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters) { diff --git a/libopenjpeg/j2k.h b/libopenjpeg/j2k.h index 6b7d9365..28d13974 100644 --- a/libopenjpeg/j2k.h +++ b/libopenjpeg/j2k.h @@ -790,8 +790,6 @@ Decoding parameters are returned in j2k->cp. @param j2k J2K decompressor handle @param parameters decompression parameters */ -void j2k_setup_decoder(opj_j2k_t *j2k, opj_dparameters_t *parameters); - void j2k_setup_decoder_v2(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters); /**