diff options
| author | Matthieu Darbois <mayeut@users.noreply.github.com> | 2016-09-06 22:33:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-06 22:33:26 +0200 |
| commit | 734d57d5f7842aa7c2c9f36d62131ab4d8bd6c87 (patch) | |
| tree | efcc04d6b1d4cb49ce7307f46f79981eb2280288 /src/lib | |
| parent | c16bc057ba3f125051c9966cf1f5b68a05681de4 (diff) | |
fix incrementing of "l_tcp->m_nb_mcc_records" in opj_j2k_read_mcc (#820)
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openjp2/j2k.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index 01d1a4ff..1cff598c 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -5405,6 +5405,7 @@ static OPJ_BOOL opj_j2k_read_mcc ( opj_j2k_t *p_j2k, OPJ_UINT32 l_nb_collections; OPJ_UINT32 l_nb_comps; OPJ_UINT32 l_nb_bytes_by_comp; + OPJ_BOOL l_new_mcc = OPJ_FALSE; /* preconditions */ assert(p_header_data != 00); @@ -5466,6 +5467,7 @@ static OPJ_BOOL opj_j2k_read_mcc ( opj_j2k_t *p_j2k, memset(l_mcc_record,0,(l_tcp->m_nb_max_mcc_records-l_tcp->m_nb_mcc_records) * sizeof(opj_simple_mcc_decorrelation_data_t)); } l_mcc_record = l_tcp->m_mcc_records + l_tcp->m_nb_mcc_records; + l_new_mcc = OPJ_TRUE; } l_mcc_record->m_index = l_indix; @@ -5601,7 +5603,9 @@ static OPJ_BOOL opj_j2k_read_mcc ( opj_j2k_t *p_j2k, return OPJ_FALSE; } - ++l_tcp->m_nb_mcc_records; + if (l_new_mcc) { + ++l_tcp->m_nb_mcc_records; + } return OPJ_TRUE; } |