From 3ec9f5fa0bf3814acf599828d7114e3af0b05a79 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Mon, 13 Aug 2012 08:54:42 +0000 Subject: [PATCH] remove deprecated v1 style functions jp2_write_jp2h --- libopenjpeg/jp2.c | 20 -------------------- libopenjpeg/jp2.h | 6 ------ 2 files changed, 26 deletions(-) diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index 83ed84c3..35e26f8e 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -1328,26 +1328,6 @@ opj_bool opj_jp2_decode(opj_jp2_v2_t *jp2, } -void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio) { - opj_jp2_box_t box; - - box.init_pos = cio_tell(cio); - cio_skip(cio, 4); - cio_write(cio, JP2_JP2H, 4); /* JP2H */ - - jp2_write_ihdr(jp2, cio); - - if (jp2->bpc == 255) { - jp2_write_bpcc(jp2, cio); - } - jp2_write_colr(jp2, cio); - - 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 Jpeg2000 file Header box - JP2 Header box (warning, this is a super box). * diff --git a/libopenjpeg/jp2.h b/libopenjpeg/jp2.h index ee0e027b..f9a12714 100644 --- a/libopenjpeg/jp2.h +++ b/libopenjpeg/jp2.h @@ -250,12 +250,6 @@ opj_jp2_img_header_writer_handler_t; /** @name Exported functions */ /*@{*/ /* ----------------------------------------------------------------------- */ -/** -Write the JP2H box - JP2 Header box (used in MJ2) -@param jp2 JP2 handle -@param cio Output buffer stream -*/ -void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio); /** * Writes the Jpeg2000 file Header box - JP2 Header box (warning, this is a super box). -- 2.40.0