diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 14:46:11 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 14:46:11 +0000 |
| commit | c077645f77beeab6647bab40f18617ec1a11cff3 (patch) | |
| tree | b2bcb3ddf7b33fc7a1797bcd5d69ef9aff420c90 /libopenjpeg | |
| parent | ebc32639875a344199be7d7042a5b5381db97924 (diff) | |
rename jp2_decode_v2 to opj_jp2_decode
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/jp2.c | 10 | ||||
| -rw-r--r-- | libopenjpeg/jp2.h | 6 | ||||
| -rw-r--r-- | libopenjpeg/openjpeg.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index 77b6c38d..307f53ab 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -1696,16 +1696,16 @@ opj_bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color) -opj_bool jp2_decode_v2( opj_jp2_v2_t *jp2, - struct opj_stream_private *cio, - opj_image_t* p_image, - struct opj_event_mgr * p_manager) +opj_bool opj_jp2_decode(opj_jp2_v2_t *jp2, + opj_stream_private_t *p_stream, + opj_image_t* p_image, + opj_event_mgr_t * p_manager) { if (!p_image) return OPJ_FALSE; /* J2K decoding */ - if( ! j2k_decode_v2(jp2->j2k, cio, p_image, p_manager) ) { + if( ! j2k_decode_v2(jp2->j2k, p_stream, p_image, p_manager) ) { opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to decode the codestream in the JP2 file\n"); return OPJ_FALSE; } diff --git a/libopenjpeg/jp2.h b/libopenjpeg/jp2.h index 89c334fc..5119ec37 100644 --- a/libopenjpeg/jp2.h +++ b/libopenjpeg/jp2.h @@ -307,10 +307,10 @@ void opj_jp2_setup_decoder(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters); * @param cstr_info Codestream information structure if required, NULL otherwise * @return Returns a decoded image if successful, returns NULL otherwise */ -opj_bool jp2_decode_v2( opj_jp2_v2_t *jp2, - struct opj_stream_private *cio, +opj_bool opj_jp2_decode(opj_jp2_v2_t *jp2, + opj_stream_private_t *p_stream, opj_image_t* p_image, - struct opj_event_mgr * p_manager); + opj_event_mgr_t * p_manager); /** diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index 5c06bc41..c1d2874d 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -363,7 +363,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format) (opj_bool (*) ( void *, struct opj_stream_private *, opj_image_t*, - struct opj_event_mgr * )) jp2_decode_v2; + struct opj_event_mgr * )) opj_jp2_decode; l_codec->m_codec_data.m_decompression.opj_end_decompress = (opj_bool (*) (void *,struct opj_stream_private *,struct opj_event_mgr *)) jp2_end_decompress; |