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

rename j2k_read_cod_v2 to opj_j2k_read_cod

This commit is contained in:
Mickael Savinaud 2012-08-09 16:36:06 +00:00
parent 94a5e081e5
commit 21d334389f
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

@ -505,12 +505,10 @@ static opj_bool j2k_write_cod_v2( opj_j2k_v2_t *p_j2k,
* @param p_header_size the size of the data contained in the COD marker. * @param p_header_size the size of the data contained in the COD marker.
* @param p_manager the user event manager. * @param p_manager the user event manager.
*/ */
static opj_bool opj_j2k_read_cod ( static opj_bool opj_j2k_read_cod ( 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 COC marker (coding style component) Write the COC marker (coding style component)
@ -1442,7 +1440,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] =
{J2K_MS_MCO, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_mco}, {J2K_MS_MCO, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_mco},
#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, j2k_read_cod_v2}, {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, j2k_read_coc_v2},
{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},
@ -2878,12 +2876,11 @@ opj_bool j2k_write_cod_v2( opj_j2k_v2_t *p_j2k,
* @param p_header_size the size of the data contained in the COD marker. * @param p_header_size the size of the data contained in the COD marker.
* @param p_manager the user event manager. * @param p_manager the user event manager.
*/ */
opj_bool j2k_read_cod_v2 ( static opj_bool opj_j2k_read_cod ( 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 )
)
{ {
/* loop */ /* loop */
OPJ_UINT32 i; OPJ_UINT32 i;