diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-02-25 16:49:26 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-02-25 16:49:26 +0000 |
| commit | 563d238fa0f22c62c675a78f52429aad7ac4bbe3 (patch) | |
| tree | 3e8f09ba6dc1da065374be9bf60927c1de936437 /src | |
| parent | 902177696320f2ee61c4f27f274c31cb46586fc1 (diff) | |
[trunk] Create a new static *_impl function to avoid a warning triggered by the deprecation mecanism
Fixes issue 257
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/openjp2/openjpeg.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c index 78b5a564..31199b24 100644 --- a/src/lib/openjp2/openjpeg.c +++ b/src/lib/openjp2/openjpeg.c @@ -1030,17 +1030,7 @@ void OPJ_CALLCONV opj_destroy_cstr_index(opj_codestream_index_t **p_cstr_index) } /* ---------------------------------------------------------------------- */ -opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream (FILE * p_file, OPJ_BOOL p_is_read_stream) -{ - return opj_stream_create_file_stream(p_file,OPJ_J2K_STREAM_CHUNK_SIZE,p_is_read_stream); -} - -opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream_v3 (const char *fname, OPJ_BOOL p_is_read_stream) -{ - return opj_stream_create_file_stream_v3(fname, OPJ_J2K_STREAM_CHUNK_SIZE, p_is_read_stream); -} - -opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream ( FILE * p_file, +static opj_stream_t* opj_stream_create_file_stream_impl ( FILE * p_file, OPJ_SIZE_T p_size, OPJ_BOOL p_is_read_stream) { @@ -1065,6 +1055,23 @@ opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream ( FILE * p_file, return l_stream; } +opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream (FILE * p_file, OPJ_BOOL p_is_read_stream) +{ + return opj_stream_create_file_stream_impl(p_file,OPJ_J2K_STREAM_CHUNK_SIZE,p_is_read_stream); +} + +opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream_v3 (const char *fname, OPJ_BOOL p_is_read_stream) +{ + return opj_stream_create_file_stream_v3(fname, OPJ_J2K_STREAM_CHUNK_SIZE, p_is_read_stream); +} + +opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream ( FILE * p_file, + OPJ_SIZE_T p_size, + OPJ_BOOL p_is_read_stream) +{ + return opj_stream_create_file_stream_impl(p_file,p_size,p_is_read_stream); +} + opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream_v3 ( const char *fname, OPJ_SIZE_T p_size, |