[trunk] Create a new static *_impl function to avoid a warning triggered by the deprecation mecanism

Fixes issue 257
This commit is contained in:
Mathieu Malaterre 2014-02-25 16:49:26 +00:00
parent 9021776963
commit 563d238fa0
1 changed files with 18 additions and 11 deletions

View File

@ -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) static opj_stream_t* opj_stream_create_file_stream_impl ( FILE * p_file,
{
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,
OPJ_SIZE_T p_size, OPJ_SIZE_T p_size,
OPJ_BOOL p_is_read_stream) 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; 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 ( opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream_v3 (
const char *fname, const char *fname,
OPJ_SIZE_T p_size, OPJ_SIZE_T p_size,