third_party/libopenjpeg20/0023-opj_j2k_read_mct_records.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31

diff --git a/third_party/libopenjpeg20/j2k.c b/third_party/libopenjpeg20/j2k.c
index ed449684f..c5f9dd53e 100644
--- a/third_party/libopenjpeg20/j2k.c
+++ b/third_party/libopenjpeg20/j2k.c
@@ -5553,6 +5553,7 @@ static OPJ_BOOL opj_j2k_read_mct(opj_j2k_t *p_j2k,
     OPJ_UINT32 l_tmp;
     OPJ_UINT32 l_indix;
     opj_mct_data_t * l_mct_data;
+    OPJ_BOOL new_mct = OPJ_FALSE;
 
     /* preconditions */
     assert(p_header_data != 00);
@@ -5640,7 +5641,7 @@ static OPJ_BOOL opj_j2k_read_mct(opj_j2k_t *p_j2k,
         }
 
         l_mct_data = l_tcp->m_mct_records + l_tcp->m_nb_mct_records;
-        ++l_tcp->m_nb_mct_records;
+        new_mct = OPJ_TRUE;
     }
 
     if (l_mct_data->m_data) {
@@ -5672,6 +5673,9 @@ static OPJ_BOOL opj_j2k_read_mct(opj_j2k_t *p_j2k,
 
     l_mct_data->m_data_size = p_header_size;
 
+    if (new_mct) {
+            ++l_tcp->m_nb_mct_records;
+    }
     return OPJ_TRUE;
 }