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/QPDFPageObjectHelper.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/QPDFPageObjectHelper.cc')
| -rw-r--r-- | libqpdf/QPDFPageObjectHelper.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libqpdf/QPDFPageObjectHelper.cc b/libqpdf/QPDFPageObjectHelper.cc index 988068f3..4706cb27 100644 --- a/libqpdf/QPDFPageObjectHelper.cc +++ b/libqpdf/QPDFPageObjectHelper.cc @@ -556,7 +556,7 @@ QPDFPageObjectHelper::pipeContents(Pipeline* p) void QPDFPageObjectHelper::addContentTokenFilter( - PointerHolder<QPDFObjectHandle::TokenFilter> token_filter) + std::shared_ptr<QPDFObjectHandle::TokenFilter> token_filter) { if (this->oh.isFormXObject()) { this->oh.addTokenFilter(token_filter); @@ -776,7 +776,7 @@ QPDFPageObjectHelper::getFormXObjectForPage(bool handle_transformations) " XObject created from page will not work"); } newdict.replaceKey("/BBox", bbox); - auto provider = PointerHolder<QPDFObjectHandle::StreamDataProvider>( + auto provider = std::shared_ptr<QPDFObjectHandle::StreamDataProvider>( new ContentProvider(this->oh)); result.replaceStreamData( provider, QPDFObjectHandle::newNull(), QPDFObjectHandle::newNull()); @@ -1060,9 +1060,9 @@ QPDFPageObjectHelper::flattenRotation(QPDFAcroFormDocumentHelper* afdh) std::vector<QPDFObjectHandle> new_annots; std::vector<QPDFObjectHandle> new_fields; std::set<QPDFObjGen> old_fields; - PointerHolder<QPDFAcroFormDocumentHelper> afdhph; + std::shared_ptr<QPDFAcroFormDocumentHelper> afdhph; if (!afdh) { - afdhph = make_pointer_holder<QPDFAcroFormDocumentHelper>(*qpdf); + afdhph = std::make_shared<QPDFAcroFormDocumentHelper>(*qpdf); afdh = afdhph.get(); } afdh->transformAnnotations( @@ -1101,10 +1101,10 @@ QPDFPageObjectHelper::copyAnnotations( std::vector<QPDFObjectHandle> new_annots; std::vector<QPDFObjectHandle> new_fields; std::set<QPDFObjGen> old_fields; - PointerHolder<QPDFAcroFormDocumentHelper> afdhph; - PointerHolder<QPDFAcroFormDocumentHelper> from_afdhph; + std::shared_ptr<QPDFAcroFormDocumentHelper> afdhph; + std::shared_ptr<QPDFAcroFormDocumentHelper> from_afdhph; if (!afdh) { - afdhph = make_pointer_holder<QPDFAcroFormDocumentHelper>(*this_qpdf); + afdhph = std::make_shared<QPDFAcroFormDocumentHelper>(*this_qpdf); afdh = afdhph.get(); } if (this_qpdf == from_qpdf) { @@ -1116,8 +1116,7 @@ QPDFPageObjectHelper::copyAnnotations( " is not from the same QPDF as from_page"); } } else { - from_afdhph = - make_pointer_holder<QPDFAcroFormDocumentHelper>(*from_qpdf); + from_afdhph = std::make_shared<QPDFAcroFormDocumentHelper>(*from_qpdf); from_afdh = from_afdhph.get(); } |