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/j2k.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/j2k.c')
| -rw-r--r-- | src/lib/openjp2/j2k.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index 1e6024eb..677a0b61 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -6126,21 +6126,25 @@ void opj_j2k_setup_encoder( opj_j2k_t *p_j2k, /* FIXME ADE: to be removed once deprecated cp_cinema and cp_rsiz have been removed */ if (parameters->rsiz == OPJ_PROFILE_NONE) { /* consider deprecated fields only if RSIZ has not been set */ + OPJ_BOOL deprecated_used = OPJ_FALSE; switch (parameters->cp_cinema){ case OPJ_CINEMA2K_24: parameters->rsiz = OPJ_PROFILE_CINEMA_2K; parameters->max_cs_size = OPJ_CINEMA_24_CS; parameters->max_comp_size = OPJ_CINEMA_24_COMP; + deprecated_used = OPJ_TRUE; break; case OPJ_CINEMA2K_48: parameters->rsiz = OPJ_PROFILE_CINEMA_2K; parameters->max_cs_size = OPJ_CINEMA_48_CS; parameters->max_comp_size = OPJ_CINEMA_48_COMP; + deprecated_used = OPJ_TRUE; break; case OPJ_CINEMA4K_24: parameters->rsiz = OPJ_PROFILE_CINEMA_4K; parameters->max_cs_size = OPJ_CINEMA_24_CS; parameters->max_comp_size = OPJ_CINEMA_24_COMP; + deprecated_used = OPJ_TRUE; break; case OPJ_OFF: default: @@ -6149,16 +6153,25 @@ void opj_j2k_setup_encoder( opj_j2k_t *p_j2k, switch (parameters->cp_rsiz){ case OPJ_CINEMA2K: parameters->rsiz = OPJ_PROFILE_CINEMA_2K; + deprecated_used = OPJ_TRUE; break; case OPJ_CINEMA4K: parameters->rsiz = OPJ_PROFILE_CINEMA_4K; + deprecated_used = OPJ_TRUE; break; case OPJ_MCT: parameters->rsiz = OPJ_PROFILE_PART2 | OPJ_EXTENSION_MCT; + deprecated_used = OPJ_TRUE; case OPJ_STD_RSIZ: default: break; } + if (deprecated_used) { + opj_event_msg(p_manager, EVT_WARNING, + "Deprecated fields cp_cinema or cp_rsiz are used\n" + "Please consider using only the rsiz field\n" + "See openjpeg.h documentation for more details\n"); + } } /* see if max_codestream_size does limit input rate */ |