walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fix incrementing of "l_tcp->m_nb_mcc_records" in opj_j2k_read_mcc (#820)

This commit is contained in:
Matthieu Darbois 2016-09-06 22:33:26 +02:00 committed by GitHub
parent c16bc057ba
commit 734d57d5f7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/openjp2/j2k.c
View File

@ -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_collections;
OPJ_UINT32 l_nb_comps; OPJ_UINT32 l_nb_comps;
OPJ_UINT32 l_nb_bytes_by_comp; OPJ_UINT32 l_nb_bytes_by_comp;
OPJ_BOOL l_new_mcc = OPJ_FALSE;
/* preconditions */ /* preconditions */
assert(p_header_data != 00); 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)); 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_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; 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; return OPJ_FALSE;
} }
++l_tcp->m_nb_mcc_records; if (l_new_mcc) {
++l_tcp->m_nb_mcc_records;
}
return OPJ_TRUE; return OPJ_TRUE;
} }