From 1279579430dfd1e57c1df05605535876d402be49 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 27 Apr 2018 21:33:58 +0000 Subject: Remove CJBig2_HuffmanTable::InitCodes(). Use CJBig2_Context::HuffmanAssignCode() instead. Change-Id: Ief187420494a8cefa26eeedb98a55683caf7807b Reviewed-on: https://pdfium-review.googlesource.com/31538 Commit-Queue: Lei Zhang Reviewed-by: Henrique Nakashima --- core/fxcodec/jbig2/JBig2_Context.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'core/fxcodec/jbig2/JBig2_Context.cpp') diff --git a/core/fxcodec/jbig2/JBig2_Context.cpp b/core/fxcodec/jbig2/JBig2_Context.cpp index 6cb94872c6..8d416ffc3c 100644 --- a/core/fxcodec/jbig2/JBig2_Context.cpp +++ b/core/fxcodec/jbig2/JBig2_Context.cpp @@ -1319,9 +1319,9 @@ std::vector CJBig2_Context::DecodeSymbolIDHuffmanTable( return SBSYMCODES; } +// static bool CJBig2_Context::HuffmanAssignCode(JBig2HuffmanCode* SBSYMCODES, uint32_t NTEMP) { - // TODO(thestig): CJBig2_HuffmanTable::InitCodes() has similar code. int LENMAX = 0; for (uint32_t i = 0; i < NTEMP; ++i) LENMAX = std::max(SBSYMCODES[i].codelen, LENMAX); @@ -1331,7 +1331,6 @@ bool CJBig2_Context::HuffmanAssignCode(JBig2HuffmanCode* SBSYMCODES, for (uint32_t i = 0; i < NTEMP; ++i) ++LENCOUNT[SBSYMCODES[i].codelen]; - LENCOUNT[0] = 0; for (int i = 1; i <= LENMAX; ++i) { pdfium::base::CheckedNumeric shifted = FIRSTCODE[i - 1]; shifted += LENCOUNT[i - 1]; @@ -1342,9 +1341,8 @@ bool CJBig2_Context::HuffmanAssignCode(JBig2HuffmanCode* SBSYMCODES, FIRSTCODE[i] = shifted.ValueOrDie(); int CURCODE = FIRSTCODE[i]; for (uint32_t j = 0; j < NTEMP; ++j) { - if (SBSYMCODES[j].codelen == i) { + if (SBSYMCODES[j].codelen == i) SBSYMCODES[j].code = CURCODE++; - } } } return true; -- cgit v1.2.3