rename j2k_setup_decoder_v2 to opj_j2k_setup_decoder

[openjpeg.git] / libopenjpeg / jp2.c

diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index eea469ff3341bacc0bd6976dc0a5e37b816930b3..73596295282c482fadb6a030d42ae005d32cbf4c 100644 (file)
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -1694,84 +1694,18 @@ opj_bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color)
 
 }/* jp2_read_jp2h() */
 
-opj_image_t* opj_jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio, 
-       opj_codestream_info_t *cstr_info) 
-{
-       opj_common_ptr cinfo;
-       opj_image_t *image = NULL;
-       opj_jp2_color_t color;
-
-       if(!jp2 || !cio) 
-   {
-       return NULL;
-   }
-       memset(&color, 0, sizeof(opj_jp2_color_t));
-       cinfo = jp2->cinfo;
-
-/* JP2 decoding */
-       if(!jp2_read_struct(jp2, cio, &color)) 
-   {
-       free_color_data(&color);
-       opj_event_msg(cinfo, EVT_ERROR, "Failed to decode jp2 structure\n");
-       return NULL;
-   }
-
-/* J2K decoding */
-       image = j2k_decode(jp2->j2k, cio, cstr_info);
-
-       if(!image) 
-   {
-       free_color_data(&color);
-       opj_event_msg(cinfo, EVT_ERROR, "Failed to decode J2K image\n");
-       return NULL;
-   }
-   
-    if (!jp2->ignore_pclr_cmap_cdef){
-
-    /* Set Image Color Space */
-       if (jp2->enumcs == 16)
-               image->color_space = CLRSPC_SRGB;
-       else if (jp2->enumcs == 17)
-               image->color_space = CLRSPC_GRAY;
-       else if (jp2->enumcs == 18)
-               image->color_space = CLRSPC_SYCC;
-       else
-               image->color_space = CLRSPC_UNKNOWN;
 
-       if(color.jp2_cdef)
-   {
-       jp2_apply_cdef(image, &color);
-   }
-       if(color.jp2_pclr)
-   {
-/* Part 1, I.5.3.4: Either both or none : */
-       if( !color.jp2_pclr->cmap) 
-        jp2_free_pclr(&color);
-       else
-        jp2_apply_pclr(image, &color);
-   }
-       if(color.icc_profile_buf)
-   {
-       image->icc_profile_buf = color.icc_profile_buf;
-       color.icc_profile_buf = NULL;
-       image->icc_profile_len = color.icc_profile_len;
-   }
-   }
-   
-       return image;
-
-}/* opj_jp2_decode() */
 
-opj_bool jp2_decode_v2(        opj_jp2_v2_t *jp2,
-                                               struct opj_stream_private *cio,
-                                               opj_image_t* p_image,
-                                               struct opj_event_mgr * p_manager)
+opj_bool opj_jp2_decode(opj_jp2_v2_t *jp2,
+                        opj_stream_private_t *p_stream,
+                        opj_image_t* p_image,
+                        opj_event_mgr_t * p_manager)
 {
        if (!p_image)
                return OPJ_FALSE;
 
        /* J2K decoding */
-       if( ! j2k_decode_v2(jp2->j2k, cio, p_image, p_manager) ) {
+       if( ! j2k_decode_v2(jp2->j2k, p_stream, p_image, p_manager) ) {
                opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to decode the codestream in the JP2 file\n");
                return OPJ_FALSE;
        }
@@ -2293,20 +2227,6 @@ static void write_iptr( int offset, int length, opj_cio_t *cio)
 /* JP2 decoder interface                                             */
 /* ----------------------------------------------------------------------- */
 
-opj_jp2_t* jp2_create_decompress(opj_common_ptr cinfo) {
-       opj_jp2_t *jp2 = (opj_jp2_t*) opj_calloc(1, sizeof(opj_jp2_t));
-       if(jp2) {
-               jp2->cinfo = cinfo;
-               /* create the J2K codec */
-               jp2->j2k = j2k_create_decompress(cinfo);
-               if(jp2->j2k == NULL) {
-                       jp2_destroy_decompress(jp2);
-                       return NULL;
-               }
-       }
-       return jp2;
-}
-
 void jp2_destroy_decompress(opj_jp2_t *jp2) {
        if(jp2) {
                /* destroy the J2K codec */
@@ -2326,7 +2246,7 @@ void jp2_destroy_decompress(opj_jp2_t *jp2) {
 void opj_jp2_setup_decoder(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters)
 {
        /* setup the J2K codec */
-       j2k_setup_decoder_v2(jp2->j2k, parameters);
+       opj_j2k_setup_decoder(jp2->j2k, parameters);
 
        /* further JP2 initializations go here */
        jp2->color.jp2_has_colr = 0;
@@ -3468,7 +3388,7 @@ opj_jp2_v2_t* jp2_create(opj_bool p_is_decoder)
                        jp2->j2k = j2k_create_compress_v2();
                }
                else {
-                       jp2->j2k = j2k_create_decompress_v2();
+                       jp2->j2k = opj_j2k_create_decompress();
                }
 
                if (jp2->j2k == 00) {