diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-10 09:53:28 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-10 09:53:28 +0000 |
| commit | f912007fe84e9ffdd85d35b23b6e7b1d3cbf613e (patch) | |
| tree | 7f7bb22e33ae2d9fc805bf073ba414eb9864faa5 | |
| parent | 377809a35bd3c274429e06c11697a04f5d757c0d (diff) | |
rename jp2_read_bpcc_v2 to opj_jp2_read_bpcc
| -rw-r--r-- | libopenjpeg/jp2.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index c2161c30..0e4426b8 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -100,12 +100,10 @@ static unsigned char * jp2_write_bpcc_v2( opj_jp2_v2_t *jp2, * * @return true if the bpc header is valid, fale else. */ -static opj_bool jp2_read_bpcc_v2( - opj_jp2_v2_t *jp2, - unsigned char * p_bpc_header_data, - unsigned int p_bpc_header_size, - struct opj_event_mgr * p_manager - ); +static opj_bool opj_jp2_read_bpcc( opj_jp2_v2_t *jp2, + OPJ_BYTE * p_bpc_header_data, + OPJ_INT32 p_bpc_header_size, + opj_event_mgr_t * p_manager ); static opj_bool jp2_read_cdef_v2( opj_jp2_v2_t * jp2, unsigned char * p_cdef_header_data, @@ -464,7 +462,7 @@ const opj_jp2_header_handler_t jp2_img_header [] = { {JP2_IHDR,opj_jp2_read_ihdr}, {JP2_COLR,jp2_read_colr_v2}, - {JP2_BPCC,jp2_read_bpcc_v2}, + {JP2_BPCC,opj_jp2_read_bpcc}, {JP2_PCLR,jp2_read_pclr_v2}, {JP2_CMAP,jp2_read_cmap_v2}, {JP2_CDEF,jp2_read_cdef_v2} @@ -823,11 +821,11 @@ unsigned char * jp2_write_bpcc_v2( opj_jp2_v2_t *jp2, * * @return true if the bpc header is valid, false otherwise. */ -opj_bool jp2_read_bpcc_v2( opj_jp2_v2_t *jp2, - unsigned char * p_bpc_header_data, - unsigned int p_bpc_header_size, - opj_event_mgr_t * p_manager - ) +static opj_bool opj_jp2_read_bpcc( opj_jp2_v2_t *jp2, + OPJ_BYTE * p_bpc_header_data, + OPJ_INT32 p_bpc_header_size, + opj_event_mgr_t * p_manager + ) { OPJ_UINT32 i; |