summaryrefslogtreecommitdiff
path: root/libopenjpeg
diff options
context:
space:
mode:
authorMickael Savinaud <savmickael@users.noreply.github.com>2012-08-10 10:24:09 +0000
committerMickael Savinaud <savmickael@users.noreply.github.com>2012-08-10 10:24:09 +0000
commitf121223ed87f8725fd30ed541ba8f48a5fe86d72 (patch)
tree20417642667cfbefeacf32529db052742938f42d /libopenjpeg
parent3c0e360df15161de69c0fc301a2730f4bae2f16f (diff)
rename jp2_read_ftyp_v2 to opj_jp2_read_ftyp
Diffstat (limited to 'libopenjpeg')
-rw-r--r--libopenjpeg/jp2.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index e5f30502..c1606cc3 100644
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -153,7 +153,7 @@ static opj_bool jp2_write_ftyp_v2( opj_jp2_v2_t *jp2,
*
* @return true if the FTYP box is valid.
*/
-static opj_bool jp2_read_ftyp_v2( opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_read_ftyp( opj_jp2_v2_t *jp2,
OPJ_BYTE * p_header_data,
OPJ_UINT32 p_header_size,
opj_event_mgr_t * p_manager );
@@ -425,7 +425,7 @@ static const opj_jp2_header_handler_t * jp2_img_find_handler (int p_id);
const opj_jp2_header_handler_t jp2_header [] =
{
{JP2_JP,jp2_read_jp_v2},
- {JP2_FTYP,jp2_read_ftyp_v2},
+ {JP2_FTYP,opj_jp2_read_ftyp},
{JP2_JP2H,opj_jp2_read_jp2h}
};
@@ -2411,12 +2411,11 @@ opj_bool jp2_read_jp_v2(
*
* @return true if the FTYP box is valid.
*/
-opj_bool jp2_read_ftyp_v2(
- opj_jp2_v2_t *jp2,
- unsigned char * p_header_data,
- unsigned int p_header_size,
- opj_event_mgr_t * p_manager
- )
+static opj_bool opj_jp2_read_ftyp( opj_jp2_v2_t *jp2,
+ OPJ_BYTE * p_header_data,
+ OPJ_UINT32 p_header_size,
+ opj_event_mgr_t * p_manager
+ )
{
OPJ_UINT32 i, l_remaining_bytes;