commit 68ef92134c84d7ab92fa2c9fe4e5546be405b1db
author Matthieu Darbois <mayeut@users.noreply.github.com> Tue Apr 11 16:55:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 11 16:55:13 2017 +0000
tree 3da85296f2b2ea27823fa16fd3389698026d5999
parent 86957661fc29ce82c3101107f95a11d1f9e59932
parent 3e2c4b9394f61fdc9aac65d2a9e288be6095ee2d

Backport 734d57d5f7842aa7c2c9f36d62131ab4d8bd6c87 from libopenjpeg20
am: 3e2c4b9394

Change-Id: I169d0b4954ac6b235f03fd552809b924265e8190

core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c

diff --git a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c
index 77a864e..e393fa9 100644
--- a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c
+++ b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c
@@ -5320,6 +5320,7 @@
         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);
@@ -5381,6 +5382,7 @@
                         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;
 
@@ -5516,7 +5518,9 @@
                 return OPJ_FALSE;
         }
 
-        ++l_tcp->m_nb_mcc_records;
+        if (l_new_mcc) {
+                ++l_tcp->m_nb_mcc_records;
+        }
 
         return OPJ_TRUE;
 }