diff options
author | Jay Berkenbilt <ejb@ql.org> | 2022-02-04 17:03:52 +0100 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2022-02-04 19:12:37 +0100 |
commit | abc300f05c00de72081203d89d9065b25f1ccb3c (patch) | |
tree | 3a679f3f3feb43a5ca3af536fb89832b0dd6e7b7 /libqpdf | |
parent | f0c2e0ef1e2b10b19fea60d5e6580910a92092e1 (diff) | |
download | qpdf-abc300f05c00de72081203d89d9065b25f1ccb3c.tar.zst |
Replace containers of PointerHolder with containers of std::shared_ptr
None of these are in the public API.
Diffstat (limited to 'libqpdf')
-rw-r--r-- | libqpdf/QPDF.cc | 2 | ||||
-rw-r--r-- | libqpdf/QPDFWriter.cc | 11 | ||||
-rw-r--r-- | libqpdf/QPDF_Stream.cc | 24 | ||||
-rw-r--r-- | libqpdf/QPDF_encryption.cc | 20 |
4 files changed, 33 insertions, 24 deletions
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index 36c812b2..120feee8 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -2910,7 +2910,7 @@ QPDF::pipeStreamData(PointerHolder<EncryptionParameters> encp, bool suppress_warnings, bool will_retry) { - std::vector<PointerHolder<Pipeline> > to_delete; + std::vector<std::shared_ptr<Pipeline>> to_delete; if (encp->encrypted) { decryptStream(encp, file, qpdf_for_warning, diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc index ede35d7e..f426f151 100644 --- a/libqpdf/QPDFWriter.cc +++ b/libqpdf/QPDFWriter.cc @@ -132,9 +132,10 @@ QPDFWriter::setOutputFile(char const* description, FILE* file, bool close_file) this->m->filename = description; this->m->file = file; this->m->close_file = close_file; - Pipeline* p = new Pl_StdioFile("qpdf output", file); + std::shared_ptr<Pipeline> p = std::make_shared<Pl_StdioFile>( + "qpdf output", file); this->m->to_delete.push_back(p); - initializePipelineStack(p); + initializePipelineStack(p.get()); } void @@ -142,7 +143,8 @@ QPDFWriter::setOutputMemory() { this->m->filename = "memory buffer"; this->m->buffer_pipeline = new Pl_Buffer("qpdf output"); - this->m->to_delete.push_back(this->m->buffer_pipeline); + this->m->to_delete.push_back( + std::shared_ptr<Pipeline>(this->m->buffer_pipeline)); initializePipelineStack(this->m->buffer_pipeline); } @@ -1051,7 +1053,8 @@ void QPDFWriter::initializePipelineStack(Pipeline *p) { this->m->pipeline = new Pl_Count("pipeline stack base", p); - this->m->to_delete.push_back(this->m->pipeline); + this->m->to_delete.push_back( + std::shared_ptr<Pipeline>(this->m->pipeline)); this->m->pipeline_stack.push_back(this->m->pipeline); } diff --git a/libqpdf/QPDF_Stream.cc b/libqpdf/QPDF_Stream.cc index 8137e211..d905d491 100644 --- a/libqpdf/QPDF_Stream.cc +++ b/libqpdf/QPDF_Stream.cc @@ -463,34 +463,36 @@ QPDF_Stream::pipeStreamData(Pipeline* pipeline, bool* filterp, // create to be deleted when this function finishes. Pipelines // created by QPDFStreamFilter objects will be deleted by those // objects. - std::vector<PointerHolder<Pipeline>> to_delete; + std::vector<std::shared_ptr<Pipeline>> to_delete; PointerHolder<ContentNormalizer> normalizer; + std::shared_ptr<Pipeline> new_pipeline; if (filter) { if (encode_flags & qpdf_ef_compress) { - pipeline = new Pl_Flate("compress stream", pipeline, - Pl_Flate::a_deflate); - to_delete.push_back(pipeline); + new_pipeline = std::make_shared<Pl_Flate>( + "compress stream", pipeline, Pl_Flate::a_deflate); + to_delete.push_back(new_pipeline); + pipeline = new_pipeline.get(); } if (encode_flags & qpdf_ef_normalize) { normalizer = new ContentNormalizer(); - pipeline = new Pl_QPDFTokenizer( + new_pipeline = std::make_shared<Pl_QPDFTokenizer>( "normalizer", normalizer.get(), pipeline); - to_delete.push_back(pipeline); + to_delete.push_back(new_pipeline); + pipeline = new_pipeline.get(); } - for (std::vector<PointerHolder< - QPDFObjectHandle::TokenFilter> >::reverse_iterator iter = - this->token_filters.rbegin(); + for (auto iter = this->token_filters.rbegin(); iter != this->token_filters.rend(); ++iter) { - pipeline = new Pl_QPDFTokenizer( + new_pipeline = std::make_shared<Pl_QPDFTokenizer>( "token filter", (*iter).get(), pipeline); - to_delete.push_back(pipeline); + to_delete.push_back(new_pipeline); + pipeline = new_pipeline.get(); } for (auto f_iter = filters.rbegin(); diff --git a/libqpdf/QPDF_encryption.cc b/libqpdf/QPDF_encryption.cc index fff35c67..54c2dadc 100644 --- a/libqpdf/QPDF_encryption.cc +++ b/libqpdf/QPDF_encryption.cc @@ -1238,7 +1238,7 @@ QPDF::decryptStream(PointerHolder<EncryptionParameters> encp, QPDF& qpdf_for_warning, Pipeline*& pipeline, int objid, int generation, QPDFObjectHandle& stream_dict, - std::vector<PointerHolder<Pipeline> >& heap) + std::vector<std::shared_ptr<Pipeline>>& heap) { std::string type; if (stream_dict.getKey("/Type").isName()) @@ -1343,21 +1343,25 @@ QPDF::decryptStream(PointerHolder<EncryptionParameters> encp, } } std::string key = getKeyForObject(encp, objid, generation, use_aes); + std::shared_ptr<Pipeline> new_pipeline; if (use_aes) { QTC::TC("qpdf", "QPDF_encryption aes decode stream"); - pipeline = new Pl_AES_PDF("AES stream decryption", pipeline, - false, QUtil::unsigned_char_pointer(key), - key.length()); + new_pipeline = std::make_shared<Pl_AES_PDF>( + "AES stream decryption", pipeline, + false, QUtil::unsigned_char_pointer(key), + key.length()); } else { QTC::TC("qpdf", "QPDF_encryption rc4 decode stream"); - pipeline = new Pl_RC4("RC4 stream decryption", pipeline, - QUtil::unsigned_char_pointer(key), - toI(key.length())); + new_pipeline = std::make_shared<Pl_RC4>( + "RC4 stream decryption", pipeline, + QUtil::unsigned_char_pointer(key), + toI(key.length())); } - heap.push_back(pipeline); + pipeline = new_pipeline.get(); + heap.push_back(new_pipeline); } void |