From 0e1c2e33787468e7faa9c9609337613c0ba6f5ff Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Mon, 13 Aug 2012 10:03:57 +0000 Subject: [PATCH] rename jp2_write_jp_v2 to opj_jp2_write_jp --- libopenjpeg/jp2.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index e2c7842f..2c3faf61 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -193,6 +193,19 @@ static opj_bool opj_jp2_read_jp(opj_jp2_v2_t *jp2, OPJ_UINT32 p_header_size, opj_event_mgr_t * p_manager); +/** + * Writes a jpeg2000 file signature box. + * + * @param cio the stream to write data to. + * @param jp2 the jpeg2000 file codec. + * @param p_manager the user event manager. + * + * @return true if writting was successful. + */ +static opj_bool opj_jp2_write_jp( opj_jp2_v2_t *jp2, + opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ); + /** Apply collected palette data @param color Collector for profile, cdef and pclr data @@ -1471,9 +1484,9 @@ opj_bool opj_jp2_write_jp2c(opj_jp2_v2_t *jp2, * * @return true if writting was successful. */ -opj_bool jp2_write_jp_v2( opj_jp2_v2_t *jp2, - opj_stream_private_t *cio, - opj_event_mgr_t * p_manager ) +opj_bool opj_jp2_write_jp( opj_jp2_v2_t *jp2, + opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) { /* 12 bytes will be read */ unsigned char l_signature_data [12]; @@ -2383,7 +2396,7 @@ void opj_jp2_setup_header_writting (opj_jp2_v2_t *jp2) /* preconditions */ assert(jp2 != 00); - opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)jp2_write_jp_v2 ); + opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp ); opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_ftyp ); opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp2h ); opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_skip_jp2c ); -- 2.30.2