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/QPDF_Stream.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/QPDF_Stream.cc')
| -rw-r--r-- | libqpdf/QPDF_Stream.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libqpdf/QPDF_Stream.cc b/libqpdf/QPDF_Stream.cc index 1521cc99..219f159a 100644 --- a/libqpdf/QPDF_Stream.cc +++ b/libqpdf/QPDF_Stream.cc @@ -221,19 +221,19 @@ QPDF_Stream::getLength() const return this->length; } -PointerHolder<Buffer> +std::shared_ptr<Buffer> QPDF_Stream::getStreamDataBuffer() const { return this->stream_data; } -PointerHolder<QPDFObjectHandle::StreamDataProvider> +std::shared_ptr<QPDFObjectHandle::StreamDataProvider> QPDF_Stream::getStreamDataProvider() const { return this->stream_provider; } -PointerHolder<Buffer> +std::shared_ptr<Buffer> QPDF_Stream::getStreamData(qpdf_stream_decode_level_e decode_level) { Pl_Buffer buf("stream data buffer"); @@ -251,7 +251,7 @@ QPDF_Stream::getStreamData(qpdf_stream_decode_level_e decode_level) return buf.getBufferSharedPointer(); } -PointerHolder<Buffer> +std::shared_ptr<Buffer> QPDF_Stream::getRawStreamData() { Pl_Buffer buf("stream data buffer"); @@ -438,7 +438,7 @@ QPDF_Stream::pipeStreamData( // objects. std::vector<std::shared_ptr<Pipeline>> to_delete; - PointerHolder<ContentNormalizer> normalizer; + std::shared_ptr<ContentNormalizer> normalizer; std::shared_ptr<Pipeline> new_pipeline; if (filter) { if (encode_flags & qpdf_ef_compress) { @@ -449,7 +449,7 @@ QPDF_Stream::pipeStreamData( } if (encode_flags & qpdf_ef_normalize) { - normalizer = make_pointer_holder<ContentNormalizer>(); + normalizer = std::make_shared<ContentNormalizer>(); new_pipeline = std::make_shared<Pl_QPDFTokenizer>( "normalizer", normalizer.get(), pipeline); to_delete.push_back(new_pipeline); @@ -586,7 +586,7 @@ QPDF_Stream::pipeStreamData( void QPDF_Stream::replaceStreamData( - PointerHolder<Buffer> data, + std::shared_ptr<Buffer> data, QPDFObjectHandle const& filter, QPDFObjectHandle const& decode_parms) { @@ -597,7 +597,7 @@ QPDF_Stream::replaceStreamData( void QPDF_Stream::replaceStreamData( - PointerHolder<QPDFObjectHandle::StreamDataProvider> provider, + std::shared_ptr<QPDFObjectHandle::StreamDataProvider> provider, QPDFObjectHandle const& filter, QPDFObjectHandle const& decode_parms) { @@ -608,7 +608,7 @@ QPDF_Stream::replaceStreamData( void QPDF_Stream::addTokenFilter( - PointerHolder<QPDFObjectHandle::TokenFilter> token_filter) + std::shared_ptr<QPDFObjectHandle::TokenFilter> token_filter) { this->token_filters.push_back(token_filter); } |