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

rename j2k_read_com_v2 to opj_j2k_read_com

This commit is contained in:
Mickael Savinaud 2012-08-10 07:44:47 +00:00
parent 5eb8a44317
commit 6ea06e87bb
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

@ -460,12 +460,10 @@ static opj_bool j2k_write_com_v2( opj_j2k_v2_t *p_j2k,
* @param p_header_size the size of the data contained in the COM marker. * @param p_header_size the size of the data contained in the COM marker.
* @param p_manager the user event manager. * @param p_manager the user event manager.
*/ */
static opj_bool j2k_read_com_v2 ( static opj_bool opj_j2k_read_com ( 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 COD and COC Write the value concerning the specified component in the marker COD and COC
@param j2k J2K handle @param j2k J2K handle
@ -1366,7 +1364,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] =
{J2K_MS_PPT, J2K_STATE_TPH, opj_j2k_read_ppt}, {J2K_MS_PPT, J2K_STATE_TPH, opj_j2k_read_ppt},
{J2K_MS_SOP, 0, 0}, {J2K_MS_SOP, 0, 0},
{J2K_MS_CRG, J2K_STATE_MH, opj_j2k_read_crg}, {J2K_MS_CRG, J2K_STATE_MH, opj_j2k_read_crg},
{J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_com_v2}, {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, j2k_read_mct},
{J2K_MS_CBD, J2K_STATE_MH , j2k_read_cbd}, {J2K_MS_CBD, J2K_STATE_MH , j2k_read_cbd},
{J2K_MS_MCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mcc}, {J2K_MS_MCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mcc},
@ -2580,12 +2578,11 @@ opj_bool j2k_write_com_v2( opj_j2k_v2_t *p_j2k,
* @param p_header_size the size of the data contained in the COM marker. * @param p_header_size the size of the data contained in the COM marker.
* @param p_manager the user event manager. * @param p_manager the user event manager.
*/ */
opj_bool j2k_read_com_v2 ( static opj_bool opj_j2k_read_com ( 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 )
)
{ {
/* preconditions */ /* preconditions */
assert(p_j2k != 00); assert(p_j2k != 00);