summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMickael Savinaud <savmickael@users.noreply.github.com>2012-08-13 09:29:37 +0000
committerMickael Savinaud <savmickael@users.noreply.github.com>2012-08-13 09:29:37 +0000
commit0ecdbe8614eb5314619c3498ef9171eb8b82891e (patch)
treead24c170dc6d06a5950e7879646049f0b4587e33
parent8b3500a2a91209cf9c29c1723312502fe7b27f35 (diff)
remove deprecated v1 style function jp2_write_bpcc
-rw-r--r--libopenjpeg/jp2.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index 24bd0db9..72618cc4 100644
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -68,8 +68,6 @@ static opj_bool opj_jp2_read_ihdr( opj_jp2_v2_t *jp2,
static OPJ_BYTE * opj_jp2_write_ihdr(opj_jp2_v2_t *jp2,
OPJ_UINT32 * p_nb_bytes_written );
-static void jp2_write_bpcc(opj_jp2_t *jp2, opj_cio_t *cio);
-
/**
* Writes the Bit per Component box.
*
@@ -78,7 +76,7 @@ static void jp2_write_bpcc(opj_jp2_t *jp2, opj_cio_t *cio);
*
* @return the data being copied.
*/
-static unsigned char * jp2_write_bpcc_v2( opj_jp2_v2_t *jp2,
+static OPJ_BYTE * jp2_write_bpcc( opj_jp2_v2_t *jp2,
unsigned int * p_nb_bytes_written );
/**
@@ -644,25 +642,6 @@ OPJ_BYTE * opj_jp2_write_ihdr(opj_jp2_v2_t *jp2,
return l_ihdr_data;
}
-static void jp2_write_bpcc(opj_jp2_t *jp2, opj_cio_t *cio) {
- unsigned int i;
- opj_jp2_box_t box;
-
- box.init_pos = cio_tell(cio);
- cio_skip(cio, 4);
- cio_write(cio, JP2_BPCC, 4); /* BPCC */
-
- for (i = 0; i < jp2->numcomps; i++) {
- cio_write(cio, jp2->comps[i].bpcc, 1);
- }
-
- box.length = cio_tell(cio) - box.init_pos;
- cio_seek(cio, box.init_pos);
- cio_write(cio, box.length, 4); /* L */
- cio_seek(cio, box.init_pos + box.length);
-}
-
-
/**
* Writes the Bit per Component box.
*