diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-25 10:23:40 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-25 10:23:40 +0000 |
| commit | 492d8ab7d9dbe9b850cf8c7a9930189a1e864c66 (patch) | |
| tree | 8d6e112aa5099f713cc9ca821550bc2bd26a8d89 /src/lib/openjp2/cio.c | |
| parent | 2b93727bea45406118bf6110aa8e725dc6d9f68b (diff) | |
[trunk] Rework previous commit r2610
This way we are able to gently deprecate the old API, and preserve ABI
Update issue 306
Diffstat (limited to 'src/lib/openjp2/cio.c')
| -rw-r--r-- | src/lib/openjp2/cio.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/openjp2/cio.c b/src/lib/openjp2/cio.c index f7f1bc72..bf91371c 100644 --- a/src/lib/openjp2/cio.c +++ b/src/lib/openjp2/cio.c @@ -246,7 +246,15 @@ 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_free_user_data_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) { opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream; if (!l_stream) |