walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

rename j2k_read_coc_v2 to opj_j2k_read_coc

This commit is contained in:
Mickael Savinaud 2012-08-09 16:40:22 +00:00
parent ffb6a9c74b
commit 76658477af
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libopenjpeg/j2k.c
View File

@ -559,12 +559,10 @@ static OPJ_UINT32 j2k_get_max_coc_size(opj_j2k_v2_t *p_j2k);
* @param p_header_size the size of the data contained in the COC marker. * @param p_header_size the size of the data contained in the COC marker.
* @param p_manager the user event manager. * @param p_manager the user event manager.
*/ */
static opj_bool j2k_read_coc_v2 ( static opj_bool opj_j2k_read_coc ( opj_j2k_v2_t *p_j2k,
opj_j2k_v2_t *p_j2k, OPJ_BYTE * p_header_data,
OPJ_BYTE * p_header_data, OPJ_UINT32 p_header_size,
OPJ_UINT32 p_header_size, opj_event_mgr_t * p_manager );
struct opj_event_mgr * p_manager
);
/** /**
Write the value concerning the specified component in the marker QCD and QCC Write the value concerning the specified component in the marker QCD and QCC
@ -1436,7 +1434,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] =
#endif #endif
{J2K_MS_SOT, J2K_STATE_MH | J2K_STATE_TPHSOT, opj_j2k_read_sot}, {J2K_MS_SOT, J2K_STATE_MH | J2K_STATE_TPHSOT, opj_j2k_read_sot},
{J2K_MS_COD, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_cod}, {J2K_MS_COD, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_cod},
{J2K_MS_COC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_coc_v2}, {J2K_MS_COC, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_coc},
{J2K_MS_RGN, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_rgn_v2}, {J2K_MS_RGN, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_rgn_v2},
{J2K_MS_QCD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcd_v2}, {J2K_MS_QCD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcd_v2},
{J2K_MS_QCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcc_v2}, {J2K_MS_QCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcc_v2},
@ -3108,12 +3106,11 @@ OPJ_UINT32 j2k_get_max_coc_size(opj_j2k_v2_t *p_j2k)
* @param p_header_size the size of the data contained in the COC marker. * @param p_header_size the size of the data contained in the COC marker.
* @param p_manager the user event manager. * @param p_manager the user event manager.
*/ */
opj_bool j2k_read_coc_v2 ( static opj_bool opj_j2k_read_coc ( opj_j2k_v2_t *p_j2k,
opj_j2k_v2_t *p_j2k, OPJ_BYTE * p_header_data,
OPJ_BYTE * p_header_data, OPJ_UINT32 p_header_size,
OPJ_UINT32 p_header_size, opj_event_mgr_t * p_manager
struct opj_event_mgr * p_manager )
)
{ {
opj_cp_v2_t *l_cp = NULL; opj_cp_v2_t *l_cp = NULL;
opj_tcp_v2_t *l_tcp = NULL; opj_tcp_v2_t *l_tcp = NULL;