aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorm-holger <m-holger@kubitscheck.org>2022-09-27 14:08:14 +0200
committerJay Berkenbilt <jberkenbilt@users.noreply.github.com>2022-11-19 20:10:42 +0100
commitd79a823d66512b5f5db2c0db739d1a867fcd5774 (patch)
treee5382b598f291e42ecf10bc8f37d2b900e4c0453
parent6350cf16e622d12ec2f68d0aa39132731dc7c73f (diff)
downloadqpdf-d79a823d66512b5f5db2c0db739d1a867fcd5774.tar.zst
Remove QPDF_Stream::getOffset and QPDF_Stream::setObjGen
-rw-r--r--libqpdf/QPDF.cc2
-rw-r--r--libqpdf/QPDF_Stream.cc17
-rw-r--r--libqpdf/qpdf/QPDF_Stream.hh6
3 files changed, 1 insertions, 24 deletions
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index bf7a03ea..262f61e6 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -2382,7 +2382,7 @@ QPDF::copyStreamData(QPDFObjectHandle result, QPDFObjectHandle foreign)
foreign_stream_qpdf.m->encp,
foreign_stream_qpdf.m->file,
foreign.getObjGen(),
- stream->getOffset(),
+ stream->getParsedOffset(),
stream->getLength(),
dict);
this->m->copied_stream_data_provider->registerForeignStream(
diff --git a/libqpdf/QPDF_Stream.cc b/libqpdf/QPDF_Stream.cc
index 8e48f9fb..ff2634ed 100644
--- a/libqpdf/QPDF_Stream.cc
+++ b/libqpdf/QPDF_Stream.cc
@@ -172,17 +172,6 @@ QPDF_Stream::disconnect()
QPDFObjectHandle::DisconnectAccess::disconnect(this->stream_dict);
}
-void
-QPDF_Stream::setObjGen(QPDFObjGen const& og)
-{
- if (this->og.isIndirect()) {
- throw std::logic_error(
- "attempt to set object ID and generation of a stream"
- " that already has them");
- }
- this->og = og;
-}
-
std::string
QPDF_Stream::unparse()
{
@@ -322,12 +311,6 @@ QPDF_Stream::isDataModified() const
return (!this->token_filters.empty());
}
-qpdf_offset_t
-QPDF_Stream::getOffset() const
-{
- return this->parsed_offset;
-}
-
size_t
QPDF_Stream::getLength() const
{
diff --git a/libqpdf/qpdf/QPDF_Stream.hh b/libqpdf/qpdf/QPDF_Stream.hh
index e58901ba..7479b127 100644
--- a/libqpdf/qpdf/QPDF_Stream.hh
+++ b/libqpdf/qpdf/QPDF_Stream.hh
@@ -34,7 +34,6 @@ class QPDF_Stream: public QPDFValue
bool getFilterOnWrite() const;
// Methods to help QPDF copy foreign streams
- qpdf_offset_t getOffset() const;
size_t getLength() const;
std::shared_ptr<Buffer> getStreamDataBuffer() const;
std::shared_ptr<QPDFObjectHandle::StreamDataProvider>
@@ -73,11 +72,6 @@ class QPDF_Stream: public QPDFValue
std::string const& filter_name,
std::function<std::shared_ptr<QPDFStreamFilter>()> factory);
- // Replace object ID and generation. This may only be called if
- // object ID and generation are 0. It is used by QPDFObjectHandle
- // when adding streams to files.
- void setObjGen(QPDFObjGen const& og);
-
private:
QPDF_Stream(
QPDF*,