Merge to XFA: openjpeg: fix incrementing of "l_tcp->m_nb_mcc_records" in opj_j2k_read_mcc

third_party/libopenjpeg20/0004-j2k_read_mcc.patch

+diff --git a/third_party/libopenjpeg20/j2k.c b/third_party/libopenjpeg20/j2k.c
+index 849d0b4..b20f219 100644
+--- a/third_party/libopenjpeg20/j2k.c
++++ b/third_party/libopenjpeg20/j2k.c
+@@ -5341,6 +5341,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 new_mcc = OPJ_FALSE;
+ 
+         /* preconditions */
+         assert(p_header_data != 00);
+@@ -5402,6 +5403,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;
++                new_mcc = OPJ_TRUE;
+         }
+         l_mcc_record->m_index = l_indix;
+ 
+@@ -5537,7 +5539,9 @@ static OPJ_BOOL opj_j2k_read_mcc (     opj_j2k_t *p_j2k,
+                 return OPJ_FALSE;
+         }
+ 
+-        ++l_tcp->m_nb_mcc_records;
++        if (new_mcc) {
++                ++l_tcp->m_nb_mcc_records;
++        }
+ 
+         return OPJ_TRUE;
+ }