summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMickael Savinaud <savmickael@users.noreply.github.com>2012-08-09 16:52:05 +0000
committerMickael Savinaud <savmickael@users.noreply.github.com>2012-08-09 16:52:05 +0000
commit3a63d978ddb85e2e832ec8811b437b97cdba038a (patch)
tree3fb4b6bba211eb0b91ea46a15b2e5406fdd4cedf
parentd2a78c33df798b19a37ccedcceb60022ae19e0c0 (diff)
rename j2k_read_qcc_v2 to opj_j2k_read_qcc
-rw-r--r--libopenjpeg/j2k.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index 9b8e762d..e67e7b95 100644
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -653,11 +653,10 @@ static OPJ_UINT32 j2k_get_max_qcc_size (opj_j2k_v2_t *p_j2k);
* @param p_header_size the size of the data contained in the QCC marker.
* @param p_manager the user event manager.
*/
-static opj_bool j2k_read_qcc_v2(
- 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_qcc( opj_j2k_v2_t *p_j2k,
+ OPJ_BYTE * p_header_data,
+ OPJ_UINT32 p_header_size,
+ opj_event_mgr_t * p_manager);
/**
Write the POC marker (progression order change)
@@ -1416,7 +1415,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] =
{J2K_MS_COC, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_coc},
{J2K_MS_RGN, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_rgn},
{J2K_MS_QCD, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_qcd},
- {J2K_MS_QCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcc_v2},
+ {J2K_MS_QCC, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_qcc},
{J2K_MS_POC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_poc_v2},
{J2K_MS_SIZ, J2K_STATE_MHSIZ , opj_j2k_read_siz},
{J2K_MS_TLM, J2K_STATE_MH, j2k_read_tlm_v2},
@@ -3487,10 +3486,11 @@ OPJ_UINT32 j2k_get_max_qcc_size (opj_j2k_v2_t *p_j2k)
* @param p_header_size the size of the data contained in the QCC marker.
* @param p_manager the user event manager.
*/
-opj_bool j2k_read_qcc_v2( 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_qcc( 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_num_comp,l_comp_no;