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

rename jp2_write_ihdr_v2 to opj_jp2_write_ihdr

This commit is contained in:
Mickael Savinaud 2012-08-13 09:27:58 +00:00
parent c5fd56606d
commit 8b3500a2a9
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libopenjpeg/jp2.c
View File

@ -65,8 +65,8 @@ static opj_bool opj_jp2_read_ihdr( opj_jp2_v2_t *jp2,
* *
* @return the data being copied. * @return the data being copied.
*/ */
static unsigned char * jp2_write_ihdr_v2( opj_jp2_v2_t *jp2, static OPJ_BYTE * opj_jp2_write_ihdr(opj_jp2_v2_t *jp2,
unsigned int * p_nb_bytes_written ); OPJ_UINT32 * p_nb_bytes_written );
static void jp2_write_bpcc(opj_jp2_t *jp2, opj_cio_t *cio); static void jp2_write_bpcc(opj_jp2_t *jp2, opj_cio_t *cio);
@ -593,8 +593,9 @@ opj_bool opj_jp2_read_ihdr( opj_jp2_v2_t *jp2,
* *
* @return the data being copied. * @return the data being copied.
*/ */
static unsigned char * opj_jp2_write_ihdr( opj_jp2_v2_t *jp2, OPJ_BYTE * opj_jp2_write_ihdr(opj_jp2_v2_t *jp2,
unsigned int * p_nb_bytes_written ) OPJ_UINT32 * p_nb_bytes_written
)
{ {
unsigned char * l_ihdr_data,* l_current_ihdr_ptr; unsigned char * l_ihdr_data,* l_current_ihdr_ptr;
@ -1337,13 +1338,13 @@ opj_bool opj_jp2_write_jp2h(opj_jp2_v2_t *jp2,
if (jp2->bpc == 255) { if (jp2->bpc == 255) {
l_nb_pass = 3; l_nb_pass = 3;
l_writers[0].handler = jp2_write_ihdr_v2; l_writers[0].handler = opj_jp2_write_ihdr;
l_writers[1].handler = jp2_write_bpcc_v2; l_writers[1].handler = jp2_write_bpcc_v2;
l_writers[2].handler = jp2_write_colr_v2; l_writers[2].handler = jp2_write_colr_v2;
} }
else { else {
l_nb_pass = 2; l_nb_pass = 2;
l_writers[0].handler = jp2_write_ihdr_v2; l_writers[0].handler = opj_jp2_write_ihdr;
l_writers[1].handler = jp2_write_colr_v2; l_writers[1].handler = jp2_write_colr_v2;
} }