.gitlab-ci.yml | 2 - cpp/poppler-image.cpp | 8 ++--- poppler/Gfx.cc | 2 - poppler/OutputDev.cc | 2 - utils/pdfinfo.cc | 80 +++++++++++++++++++++++++------------------------- 5 files changed, 47 insertions(+), 47 deletions(-)
New commits: commit 3caf1a7a54372f74090caf284ddd3e8e94286d49 Author: Albert Astals Cid <[email protected]> Date: Mon Dec 2 19:16:36 2019 +0100 Enable modernize-make-shared and modernize-make-unique diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b27033a..edbeff67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ build_clang_libcpp: script: - git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL} test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data - mkdir -p build && cd build - - CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DTESTDATADIR=$PWD/../test-data -DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation;-warnings-as-errors=*" .. + - CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DTESTDATADIR=$PWD/../test-data -DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation;-warnings-as-errors=*" .. - ninja - ctest --output-on-failure diff --git a/cpp/poppler-image.cpp b/cpp/poppler-image.cpp index 745bf221..48f021bf 100644 --- a/cpp/poppler-image.cpp +++ b/cpp/poppler-image.cpp @@ -367,21 +367,21 @@ bool image::save(const std::string &file_name, const std::string &out_format, in } #if defined(ENABLE_LIBPNG) else if (fmt == "png") { - w.reset(new PNGWriter()); + w = std::make_unique<PNGWriter>(); } #endif #if defined(ENABLE_LIBJPEG) else if (fmt == "jpeg" || fmt == "jpg") { - w.reset(new JpegWriter()); + w = std::make_unique<JpegWriter>(); } #endif #if defined(ENABLE_LIBTIFF) else if (fmt == "tiff") { - w.reset(new TiffWriter()); + w = std::make_unique<TiffWriter>(); } #endif else if (fmt == "pnm") { - w.reset(new NetPBMWriter(pnm_format(d->format))); + w = std::make_unique<NetPBMWriter>(pnm_format(d->format)); } if (!w.get()) { return false; diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc index f9dc1742..58c36fcb 100644 --- a/poppler/Gfx.cc +++ b/poppler/Gfx.cc @@ -4463,7 +4463,7 @@ void Gfx::doImage(Object *ref, Stream *str, bool inlineImg) { if (obj1.isNull()) { obj1 = maskDict->lookup("D"); } - maskColorMap.reset(new GfxImageColorMap(maskBits, &obj1, maskColorSpace)); + maskColorMap = std::make_unique<GfxImageColorMap>(maskBits, &obj1, maskColorSpace); if (!maskColorMap->isOk()) { goto err1; } diff --git a/poppler/OutputDev.cc b/poppler/OutputDev.cc index f1f766d5..f03b146b 100644 --- a/poppler/OutputDev.cc +++ b/poppler/OutputDev.cc @@ -183,7 +183,7 @@ void OutputDev::opiEnd(GfxState *state, Dict *opiDict) { #endif void OutputDev::startProfile() { - profileHash.reset(new std::unordered_map<std::string, ProfileData>); + profileHash = std::make_unique<std::unordered_map<std::string, ProfileData>>(); } std::unique_ptr<std::unordered_map<std::string, ProfileData>> OutputDev::endProfile() { diff --git a/utils/pdfinfo.cc b/utils/pdfinfo.cc index 1c4a8522..7890a75b 100644 --- a/utils/pdfinfo.cc +++ b/utils/pdfinfo.cc @@ -15,7 +15,7 @@ // under GPL version 2 or later // // Copyright (C) 2006 Dom Lachowicz <[email protected]> -// Copyright (C) 2007-2010, 2012, 2016-2018 Albert Astals Cid <[email protected]> +// Copyright (C) 2007-2010, 2012, 2016-2019 Albert Astals Cid <[email protected]> // Copyright (C) 2010 Hib Eris <[email protected]> // Copyright (C) 2011 Vittal Aithal <[email protected]> // Copyright (C) 2012, 2013, 2016-2018 Adrian Johnson <[email protected]> @@ -447,33 +447,33 @@ static void printPdfSubtype(PDFDoc *doc, UnicodeMap *uMap) { { case subtypePDFA: printInfoString(info.getDict(), "GTS_PDFA1Version", "PDF subtype: ", uMap); - typeExp.reset( new GooString("ISO 19005 - Electronic document file format for long-term preservation (PDF/A)") ); - standard.reset( new GooString("ISO 19005") ); - abbr.reset( new GooString("PDF/A") ); + typeExp = std::make_unique<GooString>("ISO 19005 - Electronic document file format for long-term preservation (PDF/A)"); + standard = std::make_unique<GooString>("ISO 19005"); + abbr = std::make_unique<GooString>("PDF/A"); break; case subtypePDFE: printInfoString(info.getDict(), "GTS_PDFEVersion", "PDF subtype: ", uMap); - typeExp.reset( new GooString("ISO 24517 - Engineering document format using PDF (PDF/E)") ); - standard.reset( new GooString("ISO 24517") ); - abbr.reset( new GooString("PDF/E") ); + typeExp = std::make_unique<GooString>("ISO 24517 - Engineering document format using PDF (PDF/E)"); + standard = std::make_unique<GooString>("ISO 24517"); + abbr = std::make_unique<GooString>("PDF/E"); break; case subtypePDFUA: printInfoString(info.getDict(), "GTS_PDFUAVersion", "PDF subtype: ", uMap); - typeExp.reset( new GooString("ISO 14289 - Electronic document file format enhancement for accessibility (PDF/UA)") ); - standard.reset( new GooString("ISO 14289") ); - abbr.reset( new GooString("PDF/UA") ); + typeExp = std::make_unique<GooString>("ISO 14289 - Electronic document file format enhancement for accessibility (PDF/UA)"); + standard = std::make_unique<GooString>("ISO 14289"); + abbr = std::make_unique<GooString>("PDF/UA"); break; case subtypePDFVT: printInfoString(info.getDict(), "GTS_PDFVTVersion", "PDF subtype: ", uMap); - typeExp.reset( new GooString("ISO 16612 - Electronic document file format for variable data exchange (PDF/VT)") ); - standard.reset( new GooString("ISO 16612") ); - abbr.reset( new GooString("PDF/VT") ); + typeExp = std::make_unique<GooString>("ISO 16612 - Electronic document file format for variable data exchange (PDF/VT)"); + standard = std::make_unique<GooString>("ISO 16612"); + abbr = std::make_unique<GooString>("PDF/VT"); break; case subtypePDFX: printInfoString(info.getDict(), "GTS_PDFXVersion", "PDF subtype: ", uMap); - typeExp.reset( new GooString("ISO 15930 - Electronic document file format for prepress digital data exchange (PDF/X)") ); - standard.reset( new GooString("ISO 15930") ); - abbr.reset( new GooString("PDF/X") ); + typeExp = std::make_unique<GooString>("ISO 15930 - Electronic document file format for prepress digital data exchange (PDF/X)"); + standard = std::make_unique<GooString>("ISO 15930"); + abbr = std::make_unique<GooString>("PDF/X"); break; case subtypeNone: case subtypeNull: @@ -537,13 +537,13 @@ static void printPdfSubtype(PDFDoc *doc, UnicodeMap *uMap) { case subtypePDFA: switch (subpart) { case subtypePart1: - part.reset( new GooString("Use of PDF 1.4") ); + part = std::make_unique<GooString>("Use of PDF 1.4"); break; case subtypePart2: - part.reset( new GooString("Use of ISO 32000-1") ); + part = std::make_unique<GooString>("Use of ISO 32000-1"); break; case subtypePart3: - part.reset( new GooString("Use of ISO 32000-1 with support for embedded files") ); + part = std::make_unique<GooString>("Use of ISO 32000-1 with support for embedded files"); break; default: break; @@ -552,7 +552,7 @@ static void printPdfSubtype(PDFDoc *doc, UnicodeMap *uMap) { case subtypePDFE: switch (subpart) { case subtypePart1: - part.reset( new GooString("Use of PDF 1.6") ); + part = std::make_unique<GooString>("Use of PDF 1.6"); break; default: break; @@ -561,13 +561,13 @@ static void printPdfSubtype(PDFDoc *doc, UnicodeMap *uMap) { case subtypePDFUA: switch (subpart) { case subtypePart1: - part.reset( new GooString("Use of ISO 32000-1") ); + part = std::make_unique<GooString>("Use of ISO 32000-1"); break; case subtypePart2: - part.reset( new GooString("Use of ISO 32000-2") ); + part = std::make_unique<GooString>("Use of ISO 32000-2"); break; case subtypePart3: - part.reset( new GooString("Use of ISO 32000-1 with support for embedded files") ); + part = std::make_unique<GooString>("Use of ISO 32000-1 with support for embedded files"); break; default: break; @@ -576,13 +576,13 @@ static void printPdfSubtype(PDFDoc *doc, UnicodeMap *uMap) { case subtypePDFVT: switch (subpart) { case subtypePart1: - part.reset( new GooString("Using PPML 2.1 and PDF 1.4") ); + part = std::make_unique<GooString>("Using PPML 2.1 and PDF 1.4"); break; case subtypePart2: - part.reset( new GooString("Using PDF/X-4 and PDF/X-5 (PDF/VT-1 and PDF/VT-2)") ); + part = std::make_unique<GooString>("Using PDF/X-4 and PDF/X-5 (PDF/VT-1 and PDF/VT-2)"); break; case subtypePart3: - part.reset( new GooString("Using PDF/X-6 (PDF/VT-3)") ); + part = std::make_unique<GooString>("Using PDF/X-6 (PDF/VT-3)"); break; default: break; @@ -591,25 +591,25 @@ static void printPdfSubtype(PDFDoc *doc, UnicodeMap *uMap) { case subtypePDFX: switch (subpart) { case subtypePart1: - part.reset( new GooString("Complete exchange using CMYK data (PDF/X-1 and PDF/X-1a)") ); + part = std::make_unique<GooString>("Complete exchange using CMYK data (PDF/X-1 and PDF/X-1a)"); break; case subtypePart3: - part.reset( new GooString("Complete exchange suitable for colour-managed workflows (PDF/X-3)") ); + part = std::make_unique<GooString>("Complete exchange suitable for colour-managed workflows (PDF/X-3)"); break; case subtypePart4: - part.reset( new GooString("Complete exchange of CMYK and spot colour printing data using PDF 1.4 (PDF/X-1a)") ); + part = std::make_unique<GooString>("Complete exchange of CMYK and spot colour printing data using PDF 1.4 (PDF/X-1a)"); break; case subtypePart5: - part.reset( new GooString("Partial exchange of printing data using PDF 1.4 (PDF/X-2) [Withdrawn]") ); + part = std::make_unique<GooString>("Partial exchange of printing data using PDF 1.4 (PDF/X-2) [Withdrawn]"); break; case subtypePart6: - part.reset( new GooString("Complete exchange of printing data suitable for colour-managed workflows using PDF 1.4 (PDF/X-3)") ); + part = std::make_unique<GooString>("Complete exchange of printing data suitable for colour-managed workflows using PDF 1.4 (PDF/X-3)"); break; case subtypePart7: - part.reset( new GooString("Complete exchange of printing data (PDF/X-4) and partial exchange of printing data with external profile reference (PDF/X-4p) using PDF 1.6") ); + part = std::make_unique<GooString>("Complete exchange of printing data (PDF/X-4) and partial exchange of printing data with external profile reference (PDF/X-4p) using PDF 1.6"); break; case subtypePart8: - part.reset( new GooString("Partial exchange of printing data using PDF 1.6 (PDF/X-5)") ); + part = std::make_unique<GooString>("Partial exchange of printing data using PDF 1.6 (PDF/X-5)"); break; default: break; @@ -623,25 +623,25 @@ static void printPdfSubtype(PDFDoc *doc, UnicodeMap *uMap) { switch (doc->getPDFSubtypeConformance()) { case subtypeConfA: - confExp.reset( new GooString("Level A, Accessible") ); + confExp = std::make_unique<GooString>("Level A, Accessible"); break; case subtypeConfB: - confExp.reset( new GooString("Level B, Basic") ); + confExp = std::make_unique<GooString>("Level B, Basic"); break; case subtypeConfG: - confExp.reset( new GooString("Level G, External graphical content") ); + confExp = std::make_unique<GooString>("Level G, External graphical content"); break; case subtypeConfN: - confExp.reset( new GooString("Level N, External ICC profile") ); + confExp = std::make_unique<GooString>("Level N, External ICC profile"); break; case subtypeConfP: - confExp.reset( new GooString("Level P, Embedded ICC profile") ); + confExp = std::make_unique<GooString>("Level P, Embedded ICC profile"); break; case subtypeConfPG: - confExp.reset( new GooString("Level PG, Embedded ICC profile and external graphical content") ); + confExp = std::make_unique<GooString>("Level PG, Embedded ICC profile and external graphical content"); break; case subtypeConfU: - confExp.reset( new GooString("Level U, Unicode support") ); + confExp = std::make_unique<GooString>("Level U, Unicode support"); break; case subtypeConfNone: case subtypeConfNull: _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
