From 24b10ac58506b9ac47f3b542fb98ae32df05f239 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Fri, 10 Aug 2012 07:58:23 +0000 Subject: [PATCH] rename j2k_read_mct to opj_j2k_read_mct, j2k_read_mco to opj_j2k_read_mco, j2k_read_mcc to opj_j2k_read_mcc --- libopenjpeg/j2k.c | 56 ++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index b5ce8dd9..3dcc3bcb 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -1049,10 +1049,10 @@ static opj_bool j2k_write_mct_record( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the MCT marker. * @param p_manager the user event manager. */ -static opj_bool j2k_read_mct ( opj_j2k_v2_t *p_j2k, - OPJ_BYTE * p_header_data, - OPJ_UINT32 p_header_size, - struct opj_event_mgr * p_manager ); +static opj_bool opj_j2k_read_mct ( opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager ); /** * Writes the MCC marker (Multiple Component Collection) @@ -1075,10 +1075,10 @@ static opj_bool j2k_write_mcc_record( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the MCC marker. * @param p_manager the user event manager. */ -static opj_bool j2k_read_mcc ( opj_j2k_v2_t *p_j2k, - OPJ_BYTE * p_header_data, - OPJ_UINT32 p_header_size, - struct opj_event_mgr * p_manager ); +static opj_bool opj_j2k_read_mcc ( opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager ); /** * Writes the MCO marker (Multiple component transformation ordering) @@ -1099,10 +1099,10 @@ static opj_bool j2k_write_mco( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the MCO marker. * @param p_manager the user event manager. */ -static opj_bool j2k_read_mco ( opj_j2k_v2_t *p_j2k, - OPJ_BYTE * p_header_data, - OPJ_UINT32 p_header_size, - struct opj_event_mgr * p_manager ); +static opj_bool opj_j2k_read_mco ( opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager ); static opj_bool j2k_add_mct(opj_tcp_v2_t * p_tcp, opj_image_t * p_image, OPJ_UINT32 p_index); @@ -1360,10 +1360,10 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] = {J2K_MS_SOP, 0, 0}, {J2K_MS_CRG, J2K_STATE_MH, opj_j2k_read_crg}, {J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_com}, - {J2K_MS_MCT, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mct}, + {J2K_MS_MCT, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_mct}, {J2K_MS_CBD, J2K_STATE_MH , opj_j2k_read_cbd}, - {J2K_MS_MCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mcc}, - {J2K_MS_MCO, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mco}, + {J2K_MS_MCC, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_mcc}, + {J2K_MS_MCO, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_mco}, #ifdef USE_JPWL #ifdef TODO_MS /* FIXME */ {J2K_MS_EPC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epc}, @@ -5806,10 +5806,11 @@ opj_bool j2k_write_mct_record( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the MCT marker. * @param p_manager the user event manager. */ -opj_bool j2k_read_mct ( opj_j2k_v2_t *p_j2k, - OPJ_BYTE * p_header_data, - OPJ_UINT32 p_header_size, - struct opj_event_mgr * p_manager ) +static opj_bool opj_j2k_read_mct ( opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager + ) { OPJ_UINT32 i; opj_tcp_v2_t *l_tcp = 00; @@ -6023,10 +6024,10 @@ opj_bool j2k_write_mcc_record( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the MCC marker. * @param p_manager the user event manager. */ -opj_bool j2k_read_mcc ( opj_j2k_v2_t *p_j2k, - OPJ_BYTE * p_header_data, - OPJ_UINT32 p_header_size, - struct opj_event_mgr * p_manager ) +opj_bool opj_j2k_read_mcc ( opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager ) { OPJ_UINT32 i,j; OPJ_UINT32 l_tmp; @@ -6307,10 +6308,11 @@ opj_bool j2k_write_mco( opj_j2k_v2_t *p_j2k, * @param p_header_size the size of the data contained in the MCO marker. * @param p_manager the user event manager. */ -opj_bool j2k_read_mco ( opj_j2k_v2_t *p_j2k, - OPJ_BYTE * p_header_data, - OPJ_UINT32 p_header_size, - struct opj_event_mgr * p_manager ) +static opj_bool opj_j2k_read_mco ( opj_j2k_v2_t *p_j2k, + OPJ_BYTE * p_header_data, + OPJ_UINT32 p_header_size, + opj_event_mgr_t * p_manager + ) { OPJ_UINT32 l_tmp, i; OPJ_UINT32 l_nb_stages;