diff options
author | Jay Berkenbilt <ejb@ql.org> | 2022-04-09 20:35:56 +0200 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2022-04-09 23:33:29 +0200 |
commit | a68703b07e928be0eeb909c0e777e13e88cbf86d (patch) | |
tree | d63d53a9facc83d72cb82f400d1ae8cce6a2115f /libqpdf/QPDFJob.cc | |
parent | ae819b5318bf0a0a21b80d6269ef73ed8123d5d6 (diff) | |
download | qpdf-a68703b07e928be0eeb909c0e777e13e88cbf86d.tar.zst |
Replace PointerHolder with std::shared_ptr in library sources only
(patrepl and cleanpatch are my own utilities)
patrepl s/PointerHolder/std::shared_ptr/g {include,libqpdf}/qpdf/*.hh
patrepl s/PointerHolder/std::shared_ptr/g libqpdf/*.cc
patrepl s/make_pointer_holder/std::make_shared/g libqpdf/*.cc
patrepl s/make_array_pointer_holder/QUtil::make_shared_array/g libqpdf/*.cc
patrepl s,qpdf/std::shared_ptr,qpdf/PointerHolder, **/*.cc **/*.hh
git restore include/qpdf/PointerHolder.hh
cleanpatch
./format-code
Diffstat (limited to 'libqpdf/QPDFJob.cc')
-rw-r--r-- | libqpdf/QPDFJob.cc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc index 99cf867f..f714c5d2 100644 --- a/libqpdf/QPDFJob.cc +++ b/libqpdf/QPDFJob.cc @@ -1879,7 +1879,7 @@ QPDFJob::processFile( std::shared_ptr<QPDF> QPDFJob::processInputSource( - PointerHolder<InputSource> is, char const* password, bool used_for_input) + std::shared_ptr<InputSource> is, char const* password, bool used_for_input) { auto f1 = std::mem_fn(&QPDF::processInputSource); auto fn = std::bind(f1, std::placeholders::_1, is, std::placeholders::_2); @@ -2238,7 +2238,7 @@ QPDFJob::handleTransformations(QPDF& pdf) m->oi_min_height, m->oi_min_area, image); - PointerHolder<QPDFObjectHandle::StreamDataProvider> sdp(io); + std::shared_ptr<QPDFObjectHandle::StreamDataProvider> sdp(io); if (io->evaluate( "image " + name + " on page " + QUtil::int_to_string(pageno))) { @@ -2494,17 +2494,17 @@ QPDFJob::handlePageSpecs( cout << prefix << ": processing " << page_spec.filename << std::endl; }); - PointerHolder<InputSource> is; + std::shared_ptr<InputSource> is; ClosedFileInputSource* cis = 0; if (!m->keep_files_open) { QTC::TC("qpdf", "QPDFJob keep files open n"); cis = new ClosedFileInputSource(page_spec.filename.c_str()); - is = PointerHolder<InputSource>(cis); + is = std::shared_ptr<InputSource>(cis); cis->stayOpen(true); } else { QTC::TC("qpdf", "QPDFJob keep files open y"); FileInputSource* fis = new FileInputSource(); - is = PointerHolder<InputSource>(fis); + is = std::shared_ptr<InputSource>(fis); fis->setFilename(page_spec.filename.c_str()); } std::shared_ptr<QPDF> qpdf_ph = @@ -3064,12 +3064,13 @@ QPDFJob::setWriterOptions(QPDF& pdf, QPDFWriter& w) w.forcePDFVersion(version, extension_level); } if (m->progress && m->outfilename) { - w.registerProgressReporter(PointerHolder<QPDFWriter::ProgressReporter>( - // line-break - new ProgressReporter( - *(this->m->cout), - this->m->message_prefix, - m->outfilename.get()))); + w.registerProgressReporter( + std::shared_ptr<QPDFWriter::ProgressReporter>( + // line-break + new ProgressReporter( + *(this->m->cout), + this->m->message_prefix, + m->outfilename.get()))); } } |