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

rename jp2_write_colr_v2 to opj_jp2_write_colr

This commit is contained in:
Mickael Savinaud 2012-08-13 09:35:16 +00:00
parent d286573958
commit 43c392626b
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

@ -106,8 +106,8 @@ static opj_bool opj_jp2_read_cdef( opj_jp2_v2_t * jp2,
* *
* @return the data being copied. * @return the data being copied.
*/ */
static unsigned char *jp2_write_colr_v2(opj_jp2_v2_t *jp2, static OPJ_BYTE * opj_jp2_write_colr( opj_jp2_v2_t *jp2,
unsigned int * p_nb_bytes_written ); OPJ_UINT32 * p_nb_bytes_written );
/** /**
Write the FTYP box - File type box Write the FTYP box - File type box
@ -737,8 +737,9 @@ opj_bool opj_jp2_read_bpcc( opj_jp2_v2_t *jp2,
* *
* @return the data being copied. * @return the data being copied.
*/ */
unsigned char *jp2_write_colr_v2( opj_jp2_v2_t *jp2, OPJ_BYTE * opj_jp2_write_colr( opj_jp2_v2_t *jp2,
unsigned int * p_nb_bytes_written ) OPJ_UINT32 * p_nb_bytes_written
)
{ {
/* room for 8 bytes for box 3 for common data and variable upon profile*/ /* room for 8 bytes for box 3 for common data and variable upon profile*/
unsigned int l_colr_size = 11; unsigned int l_colr_size = 11;
@ -1296,12 +1297,12 @@ opj_bool opj_jp2_write_jp2h(opj_jp2_v2_t *jp2,
l_nb_pass = 3; l_nb_pass = 3;
l_writers[0].handler = opj_jp2_write_ihdr; l_writers[0].handler = opj_jp2_write_ihdr;
l_writers[1].handler = opj_jp2_write_bpcc; l_writers[1].handler = opj_jp2_write_bpcc;
l_writers[2].handler = jp2_write_colr_v2; l_writers[2].handler = opj_jp2_write_colr;
} }
else { else {
l_nb_pass = 2; l_nb_pass = 2;
l_writers[0].handler = opj_jp2_write_ihdr; l_writers[0].handler = opj_jp2_write_ihdr;
l_writers[1].handler = jp2_write_colr_v2; l_writers[1].handler = opj_jp2_write_colr;
} }
/* write box header */ /* write box header */