diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2017-04-11 17:17:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-11 17:17:52 +0000 |
| commit | 831761f84ef34068526fc294bcd7e5bb799ccb1b (patch) | |
| tree | a4c08d2f49975207e7be1ec11ad9dd90a584cb3f | |
| parent | 147b75699681580cd1ba7fab7ea5251a4e84adde (diff) | |
| parent | 37654da1d3935aec3d4589f63b3cb06c497c449a (diff) | |
| download | pdfium-831761f84ef34068526fc294bcd7e5bb799ccb1b.tar.gz | |
Merge "Backport 940100c28ae28931722290794889cf84a92c5f6f from libopenjpeg20" into lmp-dev am: 57d92ccd81 am: 546760ac17 am: 10cae91e29 am: b44828b6cc am: 0ee97a4b56
am: 37654da1d3
Change-Id: Ife353743c6283e45e282771e517ec7b29dca1794
| -rw-r--r-- | core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c index e54581969..f5a1b6274 100644 --- a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c +++ b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c @@ -5620,8 +5620,7 @@ OPJ_BOOL opj_j2k_write_mco( opj_j2k_t *p_j2k, assert(p_stream != 00); l_tcp =&(p_j2k->m_cp.tcps[p_j2k->m_current_tile_number]); - l_current_data = p_j2k->m_specific_param.m_encoder.m_header_tile_data; - + l_mco_size = 5 + l_tcp->m_nb_mcc_records; if (l_mco_size > p_j2k->m_specific_param.m_encoder.m_header_tile_data_size) { @@ -5636,6 +5635,8 @@ OPJ_BOOL opj_j2k_write_mco( opj_j2k_t *p_j2k, p_j2k->m_specific_param.m_encoder.m_header_tile_data = new_header_tile_data; p_j2k->m_specific_param.m_encoder.m_header_tile_data_size = l_mco_size; } + l_current_data = p_j2k->m_specific_param.m_encoder.m_header_tile_data; + opj_write_bytes(l_current_data,J2K_MS_MCO,2); /* MCO */ l_current_data += 2; @@ -5647,10 +5648,9 @@ OPJ_BOOL opj_j2k_write_mco( opj_j2k_t *p_j2k, ++l_current_data; l_mcc_record = l_tcp->m_mcc_records; - for (i=0;i<l_tcp->m_nb_mcc_records;++i) { + for (i=0;i<l_tcp->m_nb_mcc_records;++i) { opj_write_bytes(l_current_data,l_mcc_record->m_index,1);/* Imco -> use the mcc indicated by 1*/ ++l_current_data; - ++l_mcc_record; } |