rename j2k_setup_decoder_v2 to opj_j2k_setup_decoder

[openjpeg.git] / libopenjpeg / j2k.c

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index a5617372184883a515234a041956bf27b087df63..509b627fadb44f3a91b2de1b79e70898884a83a3 100644 (file)
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -7624,22 +7624,7 @@ opj_bool j2k_read_cbd (  opj_j2k_v2_t *p_j2k,
 /* J2K / JPT decoder interface                                             */
 /* ----------------------------------------------------------------------- */
 
-opj_j2k_t* j2k_create_decompress(opj_common_ptr cinfo) {
-       opj_j2k_t *j2k = (opj_j2k_t*) opj_calloc(1, sizeof(opj_j2k_t));
-       if(!j2k)
-               return NULL;
-
-       j2k->default_tcp = (opj_tcp_t*) opj_calloc(1, sizeof(opj_tcp_t));
-       if(!j2k->default_tcp) {
-               opj_free(j2k);
-               return NULL;
-       }
-
-       j2k->cinfo = cinfo;
-       j2k->tile_data = NULL;
 
-       return j2k;
-}
 
 void j2k_destroy_decompress(opj_j2k_t *j2k) {
        int i = 0;
@@ -7688,27 +7673,8 @@ 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)
+void opj_j2k_setup_decoder(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters)
 {
        if(j2k && parameters) {
                j2k->m_cp.m_specific_param.m_dec.m_layer = parameters->cp_layer;
@@ -10542,7 +10508,7 @@ opj_bool j2k_set_decode_area(   opj_j2k_v2_t *p_j2k,
  *
  * @return a handle to a J2K decompressor if successful, NULL otherwise.
 */
-opj_j2k_v2_t* j2k_create_decompress_v2(void)
+opj_j2k_v2_t* opj_j2k_create_decompress(void)
 {
        opj_j2k_v2_t *l_j2k = (opj_j2k_v2_t*) opj_malloc(sizeof(opj_j2k_v2_t));
        if (!l_j2k) {