summaryrefslogtreecommitdiff
path: root/libopenjpeg/jp2.c
diff options
context:
space:
mode:
authorMickael Savinaud <savmickael@users.noreply.github.com>2012-08-09 14:46:11 +0000
committerMickael Savinaud <savmickael@users.noreply.github.com>2012-08-09 14:46:11 +0000
commitc077645f77beeab6647bab40f18617ec1a11cff3 (patch)
treeb2bcb3ddf7b33fc7a1797bcd5d69ef9aff420c90 /libopenjpeg/jp2.c
parentebc32639875a344199be7d7042a5b5381db97924 (diff)
rename jp2_decode_v2 to opj_jp2_decode
Diffstat (limited to 'libopenjpeg/jp2.c')
-rw-r--r--libopenjpeg/jp2.c10
1 files changed, 5 insertions, 5 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;
}