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

rename j2k_read_siz_v2 to opj_j2k_read_siz

This commit is contained in:
Mickael Savinaud 2012-08-09 15:59:14 +00:00
parent 5c303e2bb5
commit 5e78d72ef2
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

@ -429,12 +429,10 @@ static opj_bool j2k_write_siz_v2( opj_j2k_v2_t *p_j2k,
* @param p_header_size the size of the data contained in the SIZ marker. * @param p_header_size the size of the data contained in the SIZ marker.
* @param p_manager the user event manager. * @param p_manager the user event manager.
*/ */
static opj_bool j2k_read_siz_v2 ( static opj_bool opj_j2k_read_siz(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 COM marker (comment) Write the COM marker (comment)
@ -1456,7 +1454,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] =
{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},
{J2K_MS_POC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_poc_v2}, {J2K_MS_POC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_poc_v2},
{J2K_MS_SIZ, J2K_STATE_MHSIZ , j2k_read_siz_v2}, {J2K_MS_SIZ, J2K_STATE_MHSIZ , opj_j2k_read_siz},
{J2K_MS_TLM, J2K_STATE_MH, j2k_read_tlm_v2}, {J2K_MS_TLM, J2K_STATE_MH, j2k_read_tlm_v2},
{J2K_MS_PLM, J2K_STATE_MH, j2k_read_plm_v2}, {J2K_MS_PLM, J2K_STATE_MH, j2k_read_plm_v2},
{J2K_MS_PLT, J2K_STATE_TPH, j2k_read_plt_v2}, {J2K_MS_PLT, J2K_STATE_TPH, j2k_read_plt_v2},
@ -2278,12 +2276,11 @@ opj_bool j2k_write_siz_v2( opj_j2k_v2_t *p_j2k,
* @param p_header_size the size of the data contained in the SIZ marker. * @param p_header_size the size of the data contained in the SIZ marker.
* @param p_manager the user event manager. * @param p_manager the user event manager.
*/ */
opj_bool j2k_read_siz_v2 ( static opj_bool opj_j2k_read_siz(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_UINT32 l_size, i; OPJ_UINT32 l_size, i;
OPJ_UINT32 l_nb_comp; OPJ_UINT32 l_nb_comp;