summaryrefslogtreecommitdiff
path: root/libopenjpeg/jp2.c
diff options
context:
space:
mode:
authorMickael Savinaud <savmickael@users.noreply.github.com>2012-08-10 09:47:56 +0000
committerMickael Savinaud <savmickael@users.noreply.github.com>2012-08-10 09:47:56 +0000
commitf0f981b80d0276a2a81ae9207dfb9066d1f35b1f (patch)
tree805877475de3cfa35b8c22414196cdb5c1a6828a /libopenjpeg/jp2.c
parent2b9302632c433bb4e9530982603df8d1ac27fe68 (diff)
rename jp2_read_ihdr_v2 to opj_jp2_read_ihdr
Diffstat (limited to 'libopenjpeg/jp2.c')
-rw-r--r--libopenjpeg/jp2.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index c137f76a..f6d49791 100644
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -59,7 +59,7 @@ static opj_bool jp2_read_boxhdr(opj_common_ptr cinfo, opj_cio_t *cio, opj_jp2_bo
*
* @return true if the image header is valid, false else.
*/
-static opj_bool jp2_read_ihdr_v2( opj_jp2_v2_t *jp2,
+static opj_bool opj_jp2_read_ihdr( opj_jp2_v2_t *jp2,
OPJ_BYTE *p_image_header_data,
OPJ_INT32 p_image_header_size,
opj_event_mgr_t * p_manager );
@@ -464,7 +464,7 @@ const opj_jp2_header_handler_t jp2_header [] =
const opj_jp2_header_handler_t jp2_img_header [] =
{
- {JP2_IHDR,jp2_read_ihdr_v2},
+ {JP2_IHDR,opj_jp2_read_ihdr},
{JP2_COLR,jp2_read_colr_v2},
{JP2_BPCC,jp2_read_bpcc_v2},
{JP2_PCLR,jp2_read_pclr_v2},
@@ -616,11 +616,10 @@ static void jp2_write_url(opj_cio_t *cio, char *Idx_file) {
*
* @return true if the image header is valid, fale else.
*/
-opj_bool jp2_read_ihdr_v2( opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_read_ihdr( opj_jp2_v2_t *jp2,
OPJ_BYTE *p_image_header_data,
OPJ_INT32 p_image_header_size,
- opj_event_mgr_t * p_manager
- )
+ opj_event_mgr_t * p_manager )
{
/* preconditions */
assert(p_image_header_data != 00);