From d59442b054072dabfcd5c9cb766e7b60c13a1e69 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 27 Mar 2017 14:43:48 -0400 Subject: Convert new into MakeUnique This Cl converts some new calls into pdfium::MakeUnique calls. Change-Id: Ifa4a67e305ffa75e2be560447ece21ccfa70bf3f Reviewed-on: https://pdfium-review.googlesource.com/3232 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- core/fxcodec/jbig2/JBig2_SddProc.cpp | 130 ++++++++++++++++------------------- 1 file changed, 58 insertions(+), 72 deletions(-) diff --git a/core/fxcodec/jbig2/JBig2_SddProc.cpp b/core/fxcodec/jbig2/JBig2_SddProc.cpp index 5f23fcf4e1..bca2aef716 100644 --- a/core/fxcodec/jbig2/JBig2_SddProc.cpp +++ b/core/fxcodec/jbig2/JBig2_SddProc.cpp @@ -43,19 +43,19 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Arith( CJBig2_Image** SBSYMS; std::unique_ptr IAID; std::unique_ptr pDict; - std::unique_ptr IADH(new CJBig2_ArithIntDecoder); - std::unique_ptr IADW(new CJBig2_ArithIntDecoder); - std::unique_ptr IAAI(new CJBig2_ArithIntDecoder); - std::unique_ptr IARDX(new CJBig2_ArithIntDecoder); - std::unique_ptr IARDY(new CJBig2_ArithIntDecoder); - std::unique_ptr IAEX(new CJBig2_ArithIntDecoder); - std::unique_ptr IADT(new CJBig2_ArithIntDecoder); - std::unique_ptr IAFS(new CJBig2_ArithIntDecoder); - std::unique_ptr IADS(new CJBig2_ArithIntDecoder); - std::unique_ptr IAIT(new CJBig2_ArithIntDecoder); - std::unique_ptr IARI(new CJBig2_ArithIntDecoder); - std::unique_ptr IARDW(new CJBig2_ArithIntDecoder); - std::unique_ptr IARDH(new CJBig2_ArithIntDecoder); + auto IADH = pdfium::MakeUnique(); + auto IADW = pdfium::MakeUnique(); + auto IAAI = pdfium::MakeUnique(); + auto IARDX = pdfium::MakeUnique(); + auto IARDY = pdfium::MakeUnique(); + auto IAEX = pdfium::MakeUnique(); + auto IADT = pdfium::MakeUnique(); + auto IAFS = pdfium::MakeUnique(); + auto IADS = pdfium::MakeUnique(); + auto IAIT = pdfium::MakeUnique(); + auto IARI = pdfium::MakeUnique(); + auto IARDW = pdfium::MakeUnique(); + auto IARDH = pdfium::MakeUnique(); nTmp = 0; while ((uint32_t)(1 << nTmp) < (SDNUMINSYMS + SDNUMNEWSYMS)) { nTmp++; @@ -94,7 +94,7 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Arith( } TOTWIDTH = TOTWIDTH + SYMWIDTH; if (SDREFAGG == 0) { - std::unique_ptr pGRD(new CJBig2_GRDProc()); + auto pGRD = pdfium::MakeUnique(); pGRD->MMR = 0; pGRD->GBW = SYMWIDTH; pGRD->GBH = HCHEIGHT; @@ -116,7 +116,7 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Arith( } else { IAAI->decode(pArithDecoder, (int*)&REFAGGNINST); if (REFAGGNINST > 1) { - std::unique_ptr pDecoder(new CJBig2_TRDProc()); + auto pDecoder = pdfium::MakeUnique(); pDecoder->SBHUFF = SDHUFF; pDecoder->SBREFINE = 1; pDecoder->SBW = SYMWIDTH; @@ -141,27 +141,22 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Arith( pDecoder->TRANSPOSED = 0; pDecoder->REFCORNER = JBIG2_CORNER_TOPLEFT; pDecoder->SBDSOFFSET = 0; - std::unique_ptr SBHUFFFS(new CJBig2_HuffmanTable( - HuffmanTable_B6, HuffmanTable_B6_Size, HuffmanTable_HTOOB_B6)); - std::unique_ptr SBHUFFDS(new CJBig2_HuffmanTable( - HuffmanTable_B8, HuffmanTable_B8_Size, HuffmanTable_HTOOB_B8)); - std::unique_ptr SBHUFFDT(new CJBig2_HuffmanTable( - HuffmanTable_B11, HuffmanTable_B11_Size, HuffmanTable_HTOOB_B11)); - std::unique_ptr SBHUFFRDW( - new CJBig2_HuffmanTable(HuffmanTable_B15, HuffmanTable_B15_Size, - HuffmanTable_HTOOB_B15)); - std::unique_ptr SBHUFFRDH( - new CJBig2_HuffmanTable(HuffmanTable_B15, HuffmanTable_B15_Size, - HuffmanTable_HTOOB_B15)); - std::unique_ptr SBHUFFRDX( - new CJBig2_HuffmanTable(HuffmanTable_B15, HuffmanTable_B15_Size, - HuffmanTable_HTOOB_B15)); - std::unique_ptr SBHUFFRDY( - new CJBig2_HuffmanTable(HuffmanTable_B15, HuffmanTable_B15_Size, - HuffmanTable_HTOOB_B15)); - std::unique_ptr SBHUFFRSIZE( - new CJBig2_HuffmanTable(HuffmanTable_B1, HuffmanTable_B1_Size, - HuffmanTable_HTOOB_B1)); + auto SBHUFFFS = pdfium::MakeUnique( + HuffmanTable_B6, HuffmanTable_B6_Size, HuffmanTable_HTOOB_B6); + auto SBHUFFDS = pdfium::MakeUnique( + HuffmanTable_B8, HuffmanTable_B8_Size, HuffmanTable_HTOOB_B8); + auto SBHUFFDT = pdfium::MakeUnique( + HuffmanTable_B11, HuffmanTable_B11_Size, HuffmanTable_HTOOB_B11); + auto SBHUFFRDW = pdfium::MakeUnique( + HuffmanTable_B15, HuffmanTable_B15_Size, HuffmanTable_HTOOB_B15); + auto SBHUFFRDH = pdfium::MakeUnique( + HuffmanTable_B15, HuffmanTable_B15_Size, HuffmanTable_HTOOB_B15); + auto SBHUFFRDX = pdfium::MakeUnique( + HuffmanTable_B15, HuffmanTable_B15_Size, HuffmanTable_HTOOB_B15); + auto SBHUFFRDY = pdfium::MakeUnique( + HuffmanTable_B15, HuffmanTable_B15_Size, HuffmanTable_HTOOB_B15); + auto SBHUFFRSIZE = pdfium::MakeUnique( + HuffmanTable_B1, HuffmanTable_B1_Size, HuffmanTable_HTOOB_B1); pDecoder->SBHUFFFS = SBHUFFFS.get(); pDecoder->SBHUFFDS = SBHUFFDS.get(); pDecoder->SBHUFFDT = SBHUFFDT.get(); @@ -209,7 +204,7 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Arith( FX_Free(SBSYMS); goto failed; } - std::unique_ptr pGRRD(new CJBig2_GRRDProc()); + auto pGRRD = pdfium::MakeUnique(); pGRRD->GRW = SYMWIDTH; pGRRD->GRH = HCHEIGHT; pGRRD->GRTEMPLATE = SDRTEMPLATE; @@ -317,8 +312,7 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Huffman( uint32_t stride; uint32_t num_ex_syms; CJBig2_Image** SBSYMS; - std::unique_ptr pHuffmanDecoder( - new CJBig2_HuffmanDecoder(pStream)); + auto pHuffmanDecoder = pdfium::MakeUnique(pStream); SDNEWSYMS = FX_Alloc(CJBig2_Image*, SDNUMNEWSYMS); FXSYS_memset(SDNEWSYMS, 0, SDNUMNEWSYMS * sizeof(CJBig2_Image*)); SDNEWSYMWIDTHS = nullptr; @@ -327,7 +321,7 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Huffman( SDNEWSYMWIDTHS = FX_Alloc(uint32_t, SDNUMNEWSYMS); FXSYS_memset(SDNEWSYMWIDTHS, 0, SDNUMNEWSYMS * sizeof(uint32_t)); } - std::unique_ptr pDict(new CJBig2_SymbolDict()); + auto pDict = pdfium::MakeUnique(); std::unique_ptr pTable; HCHEIGHT = 0; @@ -372,7 +366,7 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Huffman( } BS = nullptr; if (REFAGGNINST > 1) { - std::unique_ptr pDecoder(new CJBig2_TRDProc()); + auto pDecoder = pdfium::MakeUnique(); pDecoder->SBHUFF = SDHUFF; pDecoder->SBREFINE = 1; pDecoder->SBW = SYMWIDTH; @@ -401,27 +395,22 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Huffman( pDecoder->TRANSPOSED = 0; pDecoder->REFCORNER = JBIG2_CORNER_TOPLEFT; pDecoder->SBDSOFFSET = 0; - std::unique_ptr SBHUFFFS(new CJBig2_HuffmanTable( - HuffmanTable_B6, HuffmanTable_B6_Size, HuffmanTable_HTOOB_B6)); - std::unique_ptr SBHUFFDS(new CJBig2_HuffmanTable( - HuffmanTable_B8, HuffmanTable_B8_Size, HuffmanTable_HTOOB_B8)); - std::unique_ptr SBHUFFDT(new CJBig2_HuffmanTable( - HuffmanTable_B11, HuffmanTable_B11_Size, HuffmanTable_HTOOB_B11)); - std::unique_ptr SBHUFFRDW( - new CJBig2_HuffmanTable(HuffmanTable_B15, HuffmanTable_B15_Size, - HuffmanTable_HTOOB_B15)); - std::unique_ptr SBHUFFRDH( - new CJBig2_HuffmanTable(HuffmanTable_B15, HuffmanTable_B15_Size, - HuffmanTable_HTOOB_B15)); - std::unique_ptr SBHUFFRDX( - new CJBig2_HuffmanTable(HuffmanTable_B15, HuffmanTable_B15_Size, - HuffmanTable_HTOOB_B15)); - std::unique_ptr SBHUFFRDY( - new CJBig2_HuffmanTable(HuffmanTable_B15, HuffmanTable_B15_Size, - HuffmanTable_HTOOB_B15)); - std::unique_ptr SBHUFFRSIZE( - new CJBig2_HuffmanTable(HuffmanTable_B1, HuffmanTable_B1_Size, - HuffmanTable_HTOOB_B1)); + auto SBHUFFFS = pdfium::MakeUnique( + HuffmanTable_B6, HuffmanTable_B6_Size, HuffmanTable_HTOOB_B6); + auto SBHUFFDS = pdfium::MakeUnique( + HuffmanTable_B8, HuffmanTable_B8_Size, HuffmanTable_HTOOB_B8); + auto SBHUFFDT = pdfium::MakeUnique( + HuffmanTable_B11, HuffmanTable_B11_Size, HuffmanTable_HTOOB_B11); + auto SBHUFFRDW = pdfium::MakeUnique( + HuffmanTable_B15, HuffmanTable_B15_Size, HuffmanTable_HTOOB_B15); + auto SBHUFFRDH = pdfium::MakeUnique( + HuffmanTable_B15, HuffmanTable_B15_Size, HuffmanTable_HTOOB_B15); + auto SBHUFFRDX = pdfium::MakeUnique( + HuffmanTable_B15, HuffmanTable_B15_Size, HuffmanTable_HTOOB_B15); + auto SBHUFFRDY = pdfium::MakeUnique( + HuffmanTable_B15, HuffmanTable_B15_Size, HuffmanTable_HTOOB_B15); + auto SBHUFFRSIZE = pdfium::MakeUnique( + HuffmanTable_B1, HuffmanTable_B1_Size, HuffmanTable_HTOOB_B1); pDecoder->SBHUFFFS = SBHUFFFS.get(); pDecoder->SBHUFFDS = SBHUFFDS.get(); pDecoder->SBHUFFDT = SBHUFFDT.get(); @@ -474,12 +463,10 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Huffman( } } FX_Free(SBSYMCODES); - std::unique_ptr SBHUFFRDX( - new CJBig2_HuffmanTable(HuffmanTable_B15, HuffmanTable_B15_Size, - HuffmanTable_HTOOB_B15)); - std::unique_ptr SBHUFFRSIZE( - new CJBig2_HuffmanTable(HuffmanTable_B1, HuffmanTable_B1_Size, - HuffmanTable_HTOOB_B1)); + auto SBHUFFRDX = pdfium::MakeUnique( + HuffmanTable_B15, HuffmanTable_B15_Size, HuffmanTable_HTOOB_B15); + auto SBHUFFRSIZE = pdfium::MakeUnique( + HuffmanTable_B1, HuffmanTable_B1_Size, HuffmanTable_HTOOB_B1); if ((pHuffmanDecoder->decodeAValue(SBHUFFRDX.get(), &RDXI) != 0) || (pHuffmanDecoder->decodeAValue(SBHUFFRDX.get(), &RDYI) != 0) || (pHuffmanDecoder->decodeAValue(SBHUFFRSIZE.get(), &nVal) != 0)) { @@ -491,7 +478,7 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Huffman( JBIG2_memcpy(SBSYMS, SDINSYMS, SDNUMINSYMS * sizeof(CJBig2_Image*)); JBIG2_memcpy(SBSYMS + SDNUMINSYMS, SDNEWSYMS, NSYMSDECODED * sizeof(CJBig2_Image*)); - std::unique_ptr pGRRD(new CJBig2_GRRDProc()); + auto pGRRD = pdfium::MakeUnique(); pGRRD->GRW = SYMWIDTH; pGRRD->GRH = HCHEIGHT; pGRRD->GRTEMPLATE = SDRTEMPLATE; @@ -503,8 +490,7 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Huffman( pGRRD->GRAT[1] = SDRAT[1]; pGRRD->GRAT[2] = SDRAT[2]; pGRRD->GRAT[3] = SDRAT[3]; - std::unique_ptr pArithDecoder( - new CJBig2_ArithDecoder(pStream)); + auto pArithDecoder = pdfium::MakeUnique(pStream); BS = pGRRD->decode(pArithDecoder.get(), grContext->data()); if (!BS) { FX_Free(SBSYMS); @@ -544,7 +530,7 @@ CJBig2_SymbolDict* CJBig2_SDDProc::decode_Huffman( goto failed; } } else { - std::unique_ptr pGRD(new CJBig2_GRDProc()); + auto pGRD = pdfium::MakeUnique(); pGRD->MMR = 1; pGRD->GBW = TOTWIDTH; pGRD->GBH = HCHEIGHT; -- cgit v1.2.3