diff options
| author | Antonin Descampe <antonin@gmail.com> | 2014-04-23 07:46:11 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2014-04-23 07:46:11 +0000 |
| commit | 7aece5e8e7d4214d140a45aca50a824ff8092924 (patch) | |
| tree | 85599bd1108ecab5b12fad8dcea894f250b97145 /src/lib/openjp2/cio.c | |
| parent | 8d93eae64acd18fac3c856e0a311905359233b96 (diff) | |
[trunk]Replaced deprecated opj_stream_set_user_data function from API
with its 'v3' version, and removed all other 'v3' suffixes from API.
Diffstat (limited to 'src/lib/openjp2/cio.c')
| -rw-r--r-- | src/lib/openjp2/cio.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/lib/openjp2/cio.c b/src/lib/openjp2/cio.c index 6cba658a..1fc23937 100644 --- a/src/lib/openjp2/cio.c +++ b/src/lib/openjp2/cio.c @@ -204,11 +204,6 @@ void OPJ_CALLCONV opj_stream_destroy(opj_stream_t* p_stream) } } -void OPJ_CALLCONV opj_stream_destroy_v3(opj_stream_t* p_stream) -{ - opj_stream_destroy(p_stream); -} - void OPJ_CALLCONV opj_stream_set_read_function(opj_stream_t* p_stream, opj_stream_read_fn p_function) { opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream; @@ -252,15 +247,7 @@ void OPJ_CALLCONV opj_stream_set_skip_function(opj_stream_t* p_stream, opj_strea l_stream->m_skip_fn = p_function; } -void OPJ_CALLCONV opj_stream_set_user_data(opj_stream_t* p_stream, void * p_data) -{ - opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream; - if (!l_stream) - return; - l_stream->m_user_data = p_data; -} - -void OPJ_CALLCONV opj_stream_set_user_data_v3(opj_stream_t* p_stream, void * p_data, opj_stream_free_user_data_fn p_function) +void OPJ_CALLCONV opj_stream_set_user_data(opj_stream_t* p_stream, void * p_data, opj_stream_free_user_data_fn p_function) { opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream; if (!l_stream) |