remove deprecated v1 style function j2k_read_siz

[openjpeg.git] / libopenjpeg / openjpeg.c

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index be22535a6ecccb0a51e106dae41266b8dc55e95c..71076ff4c4fb9c9d6754b44ee5fd16bcf85bfe6e 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -149,23 +149,7 @@ typedef struct opj_codec_private
 opj_codec_private_t;
 
 /* ---------------------------------------------------------------------- */
-/**
- * Default callback function.
- * Do nothing.
- */
-void opj_default_callback (const char *msg, void *client_data)
-{
-}
-
-void set_default_event_handler(opj_event_mgr_t * p_manager)
-{
-       p_manager->m_error_data = 00;
-       p_manager->m_warning_data = 00;
-       p_manager->m_info_data = 00;
-       p_manager->error_handler = opj_default_callback;
-       p_manager->info_handler = opj_default_callback;
-       p_manager->warning_handler = opj_default_callback;
-}
+/* Functions to set info_handler */
 
 opj_bool OPJ_CALLCONV opj_set_info_handler(    opj_codec_t * p_codec, 
                                                                                        opj_msg_callback p_callback,
@@ -312,7 +296,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
                        l_codec->m_codec_data.m_decompression.opj_decode =
                                        (opj_bool (*) ( void *,
                                                                        struct opj_stream_private *,
-                                                                       opj_image_t*, struct opj_event_mgr * )) j2k_decode_v2;
+                                                                       opj_image_t*, struct opj_event_mgr * )) opj_j2k_decode;
 
                        l_codec->m_codec_data.m_decompression.opj_end_decompress =
                                        (opj_bool (*) ( void *,
@@ -329,7 +313,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
                                        (void (*) (void *))j2k_destroy;
 
                        l_codec->m_codec_data.m_decompression.opj_setup_decoder =
-                                       (void (*) (void * , opj_dparameters_t * )) j2k_setup_decoder_v2;
+                                       (void (*) (void * , opj_dparameters_t * )) opj_j2k_setup_decoder;
 
                        l_codec->m_codec_data.m_decompression.opj_read_tile_header =
                                        (opj_bool (*) ( void *,
@@ -358,7 +342,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
                                                                                                                                                                                                        OPJ_UINT32 res_factor,
                                                                                                                                                                                                        struct opj_event_mgr * p_manager)) j2k_set_decoded_resolution_factor;
 
-                       l_codec->m_codec = j2k_create_decompress_v2();
+                       l_codec->m_codec = opj_j2k_create_decompress();
 
                        if (! l_codec->m_codec) {
                                opj_free(l_codec);
@@ -379,7 +363,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
                                        (opj_bool (*) ( void *,
                                                                        struct opj_stream_private *,
                                                                        opj_image_t*,
-                                                                       struct opj_event_mgr * )) jp2_decode_v2;
+                                                                       struct opj_event_mgr * )) opj_jp2_decode;
 
                        l_codec->m_codec_data.m_decompression.opj_end_decompress =  (opj_bool (*) (void *,struct opj_stream_private *,struct opj_event_mgr *)) jp2_end_decompress;
 
@@ -406,7 +390,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
 
                        l_codec->m_codec_data.m_decompression.opj_destroy = (void (*) (void *))jp2_destroy;
 
-                       l_codec->m_codec_data.m_decompression.opj_setup_decoder = (void (*) (void * ,opj_dparameters_t * )) jp2_setup_decoder_v2;
+                       l_codec->m_codec_data.m_decompression.opj_setup_decoder = (void (*) (void * ,opj_dparameters_t * )) opj_jp2_setup_decoder;
 
                        l_codec->m_codec_data.m_decompression.opj_set_decode_area = (opj_bool (*) (void *,opj_image_t*, OPJ_INT32,OPJ_INT32,OPJ_INT32,OPJ_INT32, struct opj_event_mgr * )) jp2_set_decode_area;
 
@@ -435,7 +419,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
                        return 00;
        }
 
-       set_default_event_handler(&(l_codec->m_event_mgr));
+       opj_set_default_event_handler(&(l_codec->m_event_mgr));
        return (opj_codec_t*) l_codec;
 }
 
@@ -791,7 +775,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format)
                        return 00;
        }
 
-       set_default_event_handler(&(l_codec->m_event_mgr));
+       opj_set_default_event_handler(&(l_codec->m_event_mgr));
        return (opj_codec_t*) l_codec;
 }