From 0d73909e89a5c93917b9cb73fe5c03c484f2793d Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 14 Dec 2016 11:30:46 -0800 Subject: Remove CJBig2_List in favor of std::vector> Review-Url: https://codereview.chromium.org/2578663002 --- core/fxcodec/jbig2/JBig2_SddProc.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'core/fxcodec/jbig2/JBig2_SddProc.cpp') diff --git a/core/fxcodec/jbig2/JBig2_SddProc.cpp b/core/fxcodec/jbig2/JBig2_SddProc.cpp index d27ff680d5..5f23fcf4e1 100644 --- a/core/fxcodec/jbig2/JBig2_SddProc.cpp +++ b/core/fxcodec/jbig2/JBig2_SddProc.cpp @@ -264,9 +264,11 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Arith( for (I = 0; I < SDNUMINSYMS + SDNUMNEWSYMS; I++) { if (EXFLAGS[I] && J < SDNUMEXSYMS) { if (I < SDNUMINSYMS) { - pDict->AddImage(SDINSYMS[I] ? new CJBig2_Image(*SDINSYMS[I]) : nullptr); + pDict->AddImage(SDINSYMS[I] + ? pdfium::MakeUnique(*SDINSYMS[I]) + : nullptr); } else { - pDict->AddImage(SDNEWSYMS[I - SDNUMINSYMS]); + pDict->AddImage(pdfium::WrapUnique(SDNEWSYMS[I - SDNUMINSYMS])); } ++J; } else if (!EXFLAGS[I] && I >= SDNUMINSYMS) { @@ -596,9 +598,11 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Huffman( for (I = 0; I < SDNUMINSYMS + SDNUMNEWSYMS; I++) { if (EXFLAGS[I] && J < SDNUMEXSYMS) { if (I < SDNUMINSYMS) { - pDict->AddImage(SDINSYMS[I] ? new CJBig2_Image(*SDINSYMS[I]) : nullptr); + pDict->AddImage(SDINSYMS[I] + ? pdfium::MakeUnique(*SDINSYMS[I]) + : nullptr); } else { - pDict->AddImage(SDNEWSYMS[I - SDNUMINSYMS]); + pDict->AddImage(pdfium::WrapUnique(SDNEWSYMS[I - SDNUMINSYMS])); } ++J; } else if (!EXFLAGS[I] && I >= SDNUMINSYMS) { -- cgit v1.2.3