rename j2k_create_decompress_v2 to opj_j2k_create_decompress
This commit is contained in:
parent
381de6b7cb
commit
05e8aae95e
|
@ -10527,7 +10527,7 @@ opj_bool j2k_set_decode_area( opj_j2k_v2_t *p_j2k,
|
||||||
*
|
*
|
||||||
* @return a handle to a J2K decompressor if successful, NULL otherwise.
|
* @return a handle to a J2K decompressor if successful, NULL otherwise.
|
||||||
*/
|
*/
|
||||||
opj_j2k_v2_t* j2k_create_decompress_v2(void)
|
opj_j2k_v2_t* opj_j2k_create_decompress(void)
|
||||||
{
|
{
|
||||||
opj_j2k_v2_t *l_j2k = (opj_j2k_v2_t*) opj_malloc(sizeof(opj_j2k_v2_t));
|
opj_j2k_v2_t *l_j2k = (opj_j2k_v2_t*) opj_malloc(sizeof(opj_j2k_v2_t));
|
||||||
if (!l_j2k) {
|
if (!l_j2k) {
|
||||||
|
|
|
@ -956,7 +956,7 @@ opj_bool j2k_set_decode_area( opj_j2k_v2_t *p_j2k,
|
||||||
*
|
*
|
||||||
* @return a handle to a J2K decompressor if successful, NULL otherwise.
|
* @return a handle to a J2K decompressor if successful, NULL otherwise.
|
||||||
*/
|
*/
|
||||||
opj_j2k_v2_t* j2k_create_decompress_v2(void);
|
opj_j2k_v2_t* opj_j2k_create_decompress(void);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -3388,7 +3388,7 @@ opj_jp2_v2_t* jp2_create(opj_bool p_is_decoder)
|
||||||
jp2->j2k = j2k_create_compress_v2();
|
jp2->j2k = j2k_create_compress_v2();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
jp2->j2k = j2k_create_decompress_v2();
|
jp2->j2k = opj_j2k_create_decompress();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (jp2->j2k == 00) {
|
if (jp2->j2k == 00) {
|
||||||
|
|
|
@ -342,7 +342,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
|
||||||
OPJ_UINT32 res_factor,
|
OPJ_UINT32 res_factor,
|
||||||
struct opj_event_mgr * p_manager)) j2k_set_decoded_resolution_factor;
|
struct opj_event_mgr * p_manager)) j2k_set_decoded_resolution_factor;
|
||||||
|
|
||||||
l_codec->m_codec = j2k_create_decompress_v2();
|
l_codec->m_codec = opj_j2k_create_decompress();
|
||||||
|
|
||||||
if (! l_codec->m_codec) {
|
if (! l_codec->m_codec) {
|
||||||
opj_free(l_codec);
|
opj_free(l_codec);
|
||||||
|
|
Loading…
Reference in New Issue