walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

rename j2k_decode_v2 to opj_j2k_decode

This commit is contained in:
Mickael Savinaud 2012-08-09 15:16:33 +00:00
parent a51aed7ce2
commit 10e9a6b6cd
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libopenjpeg/j2k.c
View File

@ -11723,7 +11723,7 @@ static void j2k_setup_decoding_tile (opj_j2k_v2_t *p_j2k)
/**
* Decodes the tiles of the stream.
*/
opj_bool j2k_decode_v2( opj_j2k_v2_t * p_j2k,
opj_bool opj_j2k_decode(opj_j2k_v2_t * p_j2k,
opj_stream_private_t * p_stream,
opj_image_t * p_image,
opj_event_mgr_t * p_manager)

5
libopenjpeg/j2k.h
View File

@ -1004,7 +1004,10 @@ opj_codestream_index_t* j2k_get_cstr_index(opj_j2k_v2_t* p_j2k);
* @param cstr_info Codestream information structure if required, NULL otherwise
* @return Returns a decoded image if successful, returns NULL otherwise
*/
opj_bool j2k_decode_v2(opj_j2k_v2_t *j2k, struct opj_stream_private *cio, opj_image_t* p_image, opj_event_mgr_t * p_manager);
opj_bool opj_j2k_decode(opj_j2k_v2_t *j2k,
opj_stream_private_t *p_stream,
opj_image_t *p_image,
opj_event_mgr_t *p_manager);
opj_bool j2k_get_tile( opj_j2k_v2_t *p_j2k,

2
libopenjpeg/jp2.c
View File

@ -1705,7 +1705,7 @@ opj_bool opj_jp2_decode(opj_jp2_v2_t *jp2,
return OPJ_FALSE;
/* J2K decoding */
if( ! j2k_decode_v2(jp2->j2k, p_stream, p_image, p_manager) ) {
if( ! opj_j2k_decode(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;
}

2
libopenjpeg/openjpeg.c
View File

@ -296,7 +296,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
l_codec->m_codec_data.m_decompression.opj_decode =
(opj_bool (*) ( void *,
struct opj_stream_private *,
opj_image_t*, struct opj_event_mgr * )) j2k_decode_v2;
opj_image_t*, struct opj_event_mgr * )) opj_j2k_decode;
l_codec->m_codec_data.m_decompression.opj_end_decompress =
(opj_bool (*) ( void *,