diff options
Diffstat (limited to 'libqpdf')
34 files changed, 78 insertions, 80 deletions
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index d56fb29d..454c05ee 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -2120,8 +2120,7 @@ QPDF::resolveObjectsInStream(int obj_stream_number) } QPDFObjectHandle -QPDF::newIndirect( - QPDFObjGen const& og, std::shared_ptr<QPDFValueProxy> const& obj) +QPDF::newIndirect(QPDFObjGen const& og, std::shared_ptr<QPDFObject> const& obj) { obj->setObjGen(this, og); if (!obj->hasDescription()) { @@ -2133,7 +2132,7 @@ QPDF::newIndirect( void QPDF::updateCache( QPDFObjGen const& og, - std::shared_ptr<QPDFValueProxy> const& object, + std::shared_ptr<QPDFObject> const& object, qpdf_offset_t end_before_space, qpdf_offset_t end_after_space) { diff --git a/libqpdf/QPDFObject.cc b/libqpdf/QPDFObject.cc index b5d073ab..f6869925 100644 --- a/libqpdf/QPDFObject.cc +++ b/libqpdf/QPDFObject.cc @@ -4,14 +4,14 @@ #include <qpdf/QPDF_Destroyed.hh> void -QPDFValueProxy::doResolve() +QPDFObject::doResolve() { auto og = value->og; QPDF::Resolver::resolve(value->qpdf, og); } void -QPDFValueProxy::destroy() +QPDFObject::destroy() { value = QPDF_Destroyed::getInstance(); } diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index ab54b808..6225dba9 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -2287,7 +2287,7 @@ QPDFObjectHandle::copyObject( " reserved object handle direct"); } - std::shared_ptr<QPDFValueProxy> new_obj; + std::shared_ptr<QPDFObject> new_obj; if (isBool() || isInteger() || isName() || isNull() || isReal() || isString()) { diff --git a/libqpdf/QPDFValue.cc b/libqpdf/QPDFValue.cc index 99fd77d7..ca3205b7 100644 --- a/libqpdf/QPDFValue.cc +++ b/libqpdf/QPDFValue.cc @@ -2,10 +2,10 @@ #include <qpdf/QPDFObject_private.hh> -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDFValue::do_create(QPDFValue* object) { - std::shared_ptr<QPDFValueProxy> obj(new QPDFValueProxy()); + std::shared_ptr<QPDFObject> obj(new QPDFObject()); obj->value = std::shared_ptr<QPDFValue>(object); return obj; } diff --git a/libqpdf/QPDF_Array.cc b/libqpdf/QPDF_Array.cc index 6d60b789..2cbdfcec 100644 --- a/libqpdf/QPDF_Array.cc +++ b/libqpdf/QPDF_Array.cc @@ -16,19 +16,19 @@ QPDF_Array::QPDF_Array(SparseOHArray const& items) : { } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Array::create(std::vector<QPDFObjectHandle> const& items) { return do_create(new QPDF_Array(items)); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Array::create(SparseOHArray const& items) { return do_create(new QPDF_Array(items)); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Array::shallowCopy() { return create(elements); diff --git a/libqpdf/QPDF_Bool.cc b/libqpdf/QPDF_Bool.cc index 8b4c6a7a..efbfd6c9 100644 --- a/libqpdf/QPDF_Bool.cc +++ b/libqpdf/QPDF_Bool.cc @@ -6,13 +6,13 @@ QPDF_Bool::QPDF_Bool(bool val) : { } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Bool::create(bool value) { return do_create(new QPDF_Bool(value)); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Bool::shallowCopy() { return create(val); diff --git a/libqpdf/QPDF_Destroyed.cc b/libqpdf/QPDF_Destroyed.cc index 55308c9a..e12a9975 100644 --- a/libqpdf/QPDF_Destroyed.cc +++ b/libqpdf/QPDF_Destroyed.cc @@ -14,7 +14,7 @@ QPDF_Destroyed::getInstance() return instance; } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Destroyed::shallowCopy() { throw std::logic_error( diff --git a/libqpdf/QPDF_Dictionary.cc b/libqpdf/QPDF_Dictionary.cc index bf694949..afbaba4b 100644 --- a/libqpdf/QPDF_Dictionary.cc +++ b/libqpdf/QPDF_Dictionary.cc @@ -9,13 +9,13 @@ QPDF_Dictionary::QPDF_Dictionary( { } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Dictionary::create(std::map<std::string, QPDFObjectHandle> const& items) { return do_create(new QPDF_Dictionary(items)); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Dictionary::shallowCopy() { return create(items); diff --git a/libqpdf/QPDF_InlineImage.cc b/libqpdf/QPDF_InlineImage.cc index a675514a..76318196 100644 --- a/libqpdf/QPDF_InlineImage.cc +++ b/libqpdf/QPDF_InlineImage.cc @@ -6,13 +6,13 @@ QPDF_InlineImage::QPDF_InlineImage(std::string const& val) : { } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_InlineImage::create(std::string const& val) { return do_create(new QPDF_InlineImage(val)); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_InlineImage::shallowCopy() { return create(val); diff --git a/libqpdf/QPDF_Integer.cc b/libqpdf/QPDF_Integer.cc index cb9066bd..24812573 100644 --- a/libqpdf/QPDF_Integer.cc +++ b/libqpdf/QPDF_Integer.cc @@ -8,13 +8,13 @@ QPDF_Integer::QPDF_Integer(long long val) : { } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Integer::create(long long value) { return do_create(new QPDF_Integer(value)); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Integer::shallowCopy() { return create(val); diff --git a/libqpdf/QPDF_Name.cc b/libqpdf/QPDF_Name.cc index e793affb..c86d34b4 100644 --- a/libqpdf/QPDF_Name.cc +++ b/libqpdf/QPDF_Name.cc @@ -10,13 +10,13 @@ QPDF_Name::QPDF_Name(std::string const& name) : { } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Name::create(std::string const& name) { return do_create(new QPDF_Name(name)); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Name::shallowCopy() { return create(name); diff --git a/libqpdf/QPDF_Null.cc b/libqpdf/QPDF_Null.cc index 0b824828..f60dda1f 100644 --- a/libqpdf/QPDF_Null.cc +++ b/libqpdf/QPDF_Null.cc @@ -5,13 +5,13 @@ QPDF_Null::QPDF_Null() : { } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Null::create() { return do_create(new QPDF_Null()); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Null::shallowCopy() { return create(); diff --git a/libqpdf/QPDF_Operator.cc b/libqpdf/QPDF_Operator.cc index f29ab23d..547ff40a 100644 --- a/libqpdf/QPDF_Operator.cc +++ b/libqpdf/QPDF_Operator.cc @@ -6,13 +6,13 @@ QPDF_Operator::QPDF_Operator(std::string const& val) : { } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Operator::create(std::string const& val) { return do_create(new QPDF_Operator(val)); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Operator::shallowCopy() { return create(val); diff --git a/libqpdf/QPDF_Real.cc b/libqpdf/QPDF_Real.cc index 32c03b63..85c9ceeb 100644 --- a/libqpdf/QPDF_Real.cc +++ b/libqpdf/QPDF_Real.cc @@ -15,20 +15,20 @@ QPDF_Real::QPDF_Real( { } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Real::create(std::string const& val) { return do_create(new QPDF_Real(val)); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Real::create(double value, int decimal_places, bool trim_trailing_zeroes) { return do_create( new QPDF_Real(value, decimal_places, trim_trailing_zeroes)); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Real::shallowCopy() { return create(val); diff --git a/libqpdf/QPDF_Reserved.cc b/libqpdf/QPDF_Reserved.cc index 9e795e57..b3669320 100644 --- a/libqpdf/QPDF_Reserved.cc +++ b/libqpdf/QPDF_Reserved.cc @@ -7,13 +7,13 @@ QPDF_Reserved::QPDF_Reserved() : { } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Reserved::create() { return do_create(new QPDF_Reserved()); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Reserved::shallowCopy() { return create(); diff --git a/libqpdf/QPDF_Stream.cc b/libqpdf/QPDF_Stream.cc index 83610e94..e2878904 100644 --- a/libqpdf/QPDF_Stream.cc +++ b/libqpdf/QPDF_Stream.cc @@ -130,7 +130,7 @@ QPDF_Stream::QPDF_Stream( qpdf, qpdf->getFilename() + ", stream object " + og.unparse(' ')); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Stream::create( QPDF* qpdf, QPDFObjGen const& og, @@ -141,7 +141,7 @@ QPDF_Stream::create( return do_create(new QPDF_Stream(qpdf, og, stream_dict, offset, length)); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Stream::shallowCopy() { throw std::logic_error("stream objects cannot be cloned"); diff --git a/libqpdf/QPDF_String.cc b/libqpdf/QPDF_String.cc index a9819325..c6cb6c41 100644 --- a/libqpdf/QPDF_String.cc +++ b/libqpdf/QPDF_String.cc @@ -26,13 +26,13 @@ QPDF_String::QPDF_String(std::string const& val) : { } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_String::create(std::string const& val) { return do_create(new QPDF_String(val)); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_String::create_utf16(std::string const& utf8_val) { std::string result; @@ -42,7 +42,7 @@ QPDF_String::create_utf16(std::string const& utf8_val) return do_create(new QPDF_String(result)); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_String::shallowCopy() { return create(val); diff --git a/libqpdf/QPDF_Unresolved.cc b/libqpdf/QPDF_Unresolved.cc index 79553c1e..c069842b 100644 --- a/libqpdf/QPDF_Unresolved.cc +++ b/libqpdf/QPDF_Unresolved.cc @@ -7,13 +7,13 @@ QPDF_Unresolved::QPDF_Unresolved(QPDF* qpdf, QPDFObjGen const& og) : { } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Unresolved::create(QPDF* qpdf, QPDFObjGen const& og) { return do_create(new QPDF_Unresolved(qpdf, og)); } -std::shared_ptr<QPDFValueProxy> +std::shared_ptr<QPDFObject> QPDF_Unresolved::shallowCopy() { throw std::logic_error( diff --git a/libqpdf/qpdf/QPDFObject_private.hh b/libqpdf/qpdf/QPDFObject_private.hh index 84aaabe4..42bd02b5 100644 --- a/libqpdf/qpdf/QPDFObject_private.hh +++ b/libqpdf/qpdf/QPDFObject_private.hh @@ -16,14 +16,14 @@ class QPDF; class QPDFObjectHandle; -class QPDFValueProxy +class QPDFObject { friend class QPDFValue; public: - QPDFValueProxy() = default; + QPDFObject() = default; - std::shared_ptr<QPDFValueProxy> + std::shared_ptr<QPDFObject> shallowCopy() { return value->shallowCopy(); @@ -91,12 +91,12 @@ class QPDFValueProxy return value->getParsedOffset(); } void - assign(std::shared_ptr<QPDFValueProxy> o) + assign(std::shared_ptr<QPDFObject> o) { value = o->value; } void - swapWith(std::shared_ptr<QPDFValueProxy> o) + swapWith(std::shared_ptr<QPDFObject> o) { auto v = value; value = o->value; @@ -148,8 +148,8 @@ class QPDFValueProxy } private: - QPDFValueProxy(QPDFValueProxy const&) = delete; - QPDFValueProxy& operator=(QPDFValueProxy const&) = delete; + QPDFObject(QPDFObject const&) = delete; + QPDFObject& operator=(QPDFObject const&) = delete; std::shared_ptr<QPDFValue> value; }; diff --git a/libqpdf/qpdf/QPDFValue.hh b/libqpdf/qpdf/QPDFValue.hh index dbde018c..0f85f79f 100644 --- a/libqpdf/qpdf/QPDFValue.hh +++ b/libqpdf/qpdf/QPDFValue.hh @@ -11,16 +11,16 @@ class QPDF; class QPDFObjectHandle; -class QPDFValueProxy; +class QPDFObject; class QPDFValue { - friend class QPDFValueProxy; + friend class QPDFObject; public: virtual ~QPDFValue() = default; - virtual std::shared_ptr<QPDFValueProxy> shallowCopy() = 0; + virtual std::shared_ptr<QPDFObject> shallowCopy() = 0; virtual std::string unparse() = 0; virtual JSON getJSON(int json_version) = 0; virtual void @@ -91,7 +91,7 @@ class QPDFValue { } - static std::shared_ptr<QPDFValueProxy> do_create(QPDFValue*); + static std::shared_ptr<QPDFObject> do_create(QPDFValue*); private: QPDFValue(QPDFValue const&) = delete; diff --git a/libqpdf/qpdf/QPDF_Array.hh b/libqpdf/qpdf/QPDF_Array.hh index 8fb227da..61482848 100644 --- a/libqpdf/qpdf/QPDF_Array.hh +++ b/libqpdf/qpdf/QPDF_Array.hh @@ -11,10 +11,10 @@ class QPDF_Array: public QPDFValue { public: virtual ~QPDF_Array() = default; - static std::shared_ptr<QPDFValueProxy> + static std::shared_ptr<QPDFObject> create(std::vector<QPDFObjectHandle> const& items); - static std::shared_ptr<QPDFValueProxy> create(SparseOHArray const& items); - virtual std::shared_ptr<QPDFValueProxy> shallowCopy(); + static std::shared_ptr<QPDFObject> create(SparseOHArray const& items); + virtual std::shared_ptr<QPDFObject> shallowCopy(); virtual std::string unparse(); virtual JSON getJSON(int json_version); virtual void disconnect(); diff --git a/libqpdf/qpdf/QPDF_Bool.hh b/libqpdf/qpdf/QPDF_Bool.hh index 33704176..3e45cd8e 100644 --- a/libqpdf/qpdf/QPDF_Bool.hh +++ b/libqpdf/qpdf/QPDF_Bool.hh @@ -7,8 +7,8 @@ class QPDF_Bool: public QPDFValue { public: virtual ~QPDF_Bool() = default; - static std::shared_ptr<QPDFValueProxy> create(bool val); - virtual std::shared_ptr<QPDFValueProxy> shallowCopy(); + static std::shared_ptr<QPDFObject> create(bool val); + virtual std::shared_ptr<QPDFObject> shallowCopy(); virtual std::string unparse(); virtual JSON getJSON(int json_version); bool getVal() const; diff --git a/libqpdf/qpdf/QPDF_Destroyed.hh b/libqpdf/qpdf/QPDF_Destroyed.hh index 78c2d601..def4346a 100644 --- a/libqpdf/qpdf/QPDF_Destroyed.hh +++ b/libqpdf/qpdf/QPDF_Destroyed.hh @@ -7,7 +7,7 @@ class QPDF_Destroyed: public QPDFValue { public: virtual ~QPDF_Destroyed() = default; - virtual std::shared_ptr<QPDFValueProxy> shallowCopy(); + virtual std::shared_ptr<QPDFObject> shallowCopy(); virtual std::string unparse(); virtual JSON getJSON(int json_version); static std::shared_ptr<QPDFValue> getInstance(); diff --git a/libqpdf/qpdf/QPDF_Dictionary.hh b/libqpdf/qpdf/QPDF_Dictionary.hh index 96985fe7..e6ec76fd 100644 --- a/libqpdf/qpdf/QPDF_Dictionary.hh +++ b/libqpdf/qpdf/QPDF_Dictionary.hh @@ -12,9 +12,9 @@ class QPDF_Dictionary: public QPDFValue { public: virtual ~QPDF_Dictionary() = default; - static std::shared_ptr<QPDFValueProxy> + static std::shared_ptr<QPDFObject> create(std::map<std::string, QPDFObjectHandle> const& items); - virtual std::shared_ptr<QPDFValueProxy> shallowCopy(); + virtual std::shared_ptr<QPDFObject> shallowCopy(); virtual std::string unparse(); virtual JSON getJSON(int json_version); virtual void disconnect(); diff --git a/libqpdf/qpdf/QPDF_InlineImage.hh b/libqpdf/qpdf/QPDF_InlineImage.hh index 9c21c183..b7bea9c7 100644 --- a/libqpdf/qpdf/QPDF_InlineImage.hh +++ b/libqpdf/qpdf/QPDF_InlineImage.hh @@ -7,8 +7,8 @@ class QPDF_InlineImage: public QPDFValue { public: virtual ~QPDF_InlineImage() = default; - static std::shared_ptr<QPDFValueProxy> create(std::string const& val); - virtual std::shared_ptr<QPDFValueProxy> shallowCopy(); + static std::shared_ptr<QPDFObject> create(std::string const& val); + virtual std::shared_ptr<QPDFObject> shallowCopy(); virtual std::string unparse(); virtual JSON getJSON(int json_version); std::string getVal() const; diff --git a/libqpdf/qpdf/QPDF_Integer.hh b/libqpdf/qpdf/QPDF_Integer.hh index 448bc059..7e09673c 100644 --- a/libqpdf/qpdf/QPDF_Integer.hh +++ b/libqpdf/qpdf/QPDF_Integer.hh @@ -7,8 +7,8 @@ class QPDF_Integer: public QPDFValue { public: virtual ~QPDF_Integer() = default; - static std::shared_ptr<QPDFValueProxy> create(long long value); - virtual std::shared_ptr<QPDFValueProxy> shallowCopy(); + static std::shared_ptr<QPDFObject> create(long long value); + virtual std::shared_ptr<QPDFObject> shallowCopy(); virtual std::string unparse(); virtual JSON getJSON(int json_version); long long getVal() const; diff --git a/libqpdf/qpdf/QPDF_Name.hh b/libqpdf/qpdf/QPDF_Name.hh index bf46ee14..74fc7e44 100644 --- a/libqpdf/qpdf/QPDF_Name.hh +++ b/libqpdf/qpdf/QPDF_Name.hh @@ -7,8 +7,8 @@ class QPDF_Name: public QPDFValue { public: virtual ~QPDF_Name() = default; - static std::shared_ptr<QPDFValueProxy> create(std::string const& name); - virtual std::shared_ptr<QPDFValueProxy> shallowCopy(); + static std::shared_ptr<QPDFObject> create(std::string const& name); + virtual std::shared_ptr<QPDFObject> shallowCopy(); virtual std::string unparse(); virtual JSON getJSON(int json_version); std::string getName() const; diff --git a/libqpdf/qpdf/QPDF_Null.hh b/libqpdf/qpdf/QPDF_Null.hh index 90ccda38..68973de9 100644 --- a/libqpdf/qpdf/QPDF_Null.hh +++ b/libqpdf/qpdf/QPDF_Null.hh @@ -7,8 +7,8 @@ class QPDF_Null: public QPDFValue { public: virtual ~QPDF_Null() = default; - static std::shared_ptr<QPDFValueProxy> create(); - virtual std::shared_ptr<QPDFValueProxy> shallowCopy(); + static std::shared_ptr<QPDFObject> create(); + virtual std::shared_ptr<QPDFObject> shallowCopy(); virtual std::string unparse(); virtual JSON getJSON(int json_version); diff --git a/libqpdf/qpdf/QPDF_Operator.hh b/libqpdf/qpdf/QPDF_Operator.hh index 30c40070..767c0ba0 100644 --- a/libqpdf/qpdf/QPDF_Operator.hh +++ b/libqpdf/qpdf/QPDF_Operator.hh @@ -7,8 +7,8 @@ class QPDF_Operator: public QPDFValue { public: virtual ~QPDF_Operator() = default; - static std::shared_ptr<QPDFValueProxy> create(std::string const& val); - virtual std::shared_ptr<QPDFValueProxy> shallowCopy(); + static std::shared_ptr<QPDFObject> create(std::string const& val); + virtual std::shared_ptr<QPDFObject> shallowCopy(); virtual std::string unparse(); virtual JSON getJSON(int json_version); std::string getVal() const; diff --git a/libqpdf/qpdf/QPDF_Real.hh b/libqpdf/qpdf/QPDF_Real.hh index 2e5bfa02..dc0f3ff8 100644 --- a/libqpdf/qpdf/QPDF_Real.hh +++ b/libqpdf/qpdf/QPDF_Real.hh @@ -7,10 +7,10 @@ class QPDF_Real: public QPDFValue { public: virtual ~QPDF_Real() = default; - static std::shared_ptr<QPDFValueProxy> create(std::string const& val); - static std::shared_ptr<QPDFValueProxy> + static std::shared_ptr<QPDFObject> create(std::string const& val); + static std::shared_ptr<QPDFObject> create(double value, int decimal_places, bool trim_trailing_zeroes); - virtual std::shared_ptr<QPDFValueProxy> shallowCopy(); + virtual std::shared_ptr<QPDFObject> shallowCopy(); virtual std::string unparse(); virtual JSON getJSON(int json_version); std::string getVal(); diff --git a/libqpdf/qpdf/QPDF_Reserved.hh b/libqpdf/qpdf/QPDF_Reserved.hh index 23b72ec3..f90242a9 100644 --- a/libqpdf/qpdf/QPDF_Reserved.hh +++ b/libqpdf/qpdf/QPDF_Reserved.hh @@ -7,8 +7,8 @@ class QPDF_Reserved: public QPDFValue { public: virtual ~QPDF_Reserved() = default; - static std::shared_ptr<QPDFValueProxy> create(); - virtual std::shared_ptr<QPDFValueProxy> shallowCopy(); + static std::shared_ptr<QPDFObject> create(); + virtual std::shared_ptr<QPDFObject> shallowCopy(); virtual std::string unparse(); virtual JSON getJSON(int json_version); diff --git a/libqpdf/qpdf/QPDF_Stream.hh b/libqpdf/qpdf/QPDF_Stream.hh index bf7dbca7..935476af 100644 --- a/libqpdf/qpdf/QPDF_Stream.hh +++ b/libqpdf/qpdf/QPDF_Stream.hh @@ -17,13 +17,13 @@ class QPDF_Stream: public QPDFValue { public: virtual ~QPDF_Stream() = default; - static std::shared_ptr<QPDFValueProxy> create( + static std::shared_ptr<QPDFObject> create( QPDF*, QPDFObjGen const& og, QPDFObjectHandle stream_dict, qpdf_offset_t offset, size_t length); - virtual std::shared_ptr<QPDFValueProxy> shallowCopy(); + virtual std::shared_ptr<QPDFObject> shallowCopy(); virtual std::string unparse(); virtual JSON getJSON(int json_version); virtual void setDescription(QPDF*, std::string const&); diff --git a/libqpdf/qpdf/QPDF_String.hh b/libqpdf/qpdf/QPDF_String.hh index a2cf9246..a92427e3 100644 --- a/libqpdf/qpdf/QPDF_String.hh +++ b/libqpdf/qpdf/QPDF_String.hh @@ -11,10 +11,10 @@ class QPDF_String: public QPDFValue public: virtual ~QPDF_String() = default; - static std::shared_ptr<QPDFValueProxy> create(std::string const& val); - static std::shared_ptr<QPDFValueProxy> + static std::shared_ptr<QPDFObject> create(std::string const& val); + static std::shared_ptr<QPDFObject> create_utf16(std::string const& utf8_val); - virtual std::shared_ptr<QPDFValueProxy> shallowCopy(); + virtual std::shared_ptr<QPDFObject> shallowCopy(); virtual std::string unparse(); std::string unparse(bool force_binary); virtual JSON getJSON(int json_version); diff --git a/libqpdf/qpdf/QPDF_Unresolved.hh b/libqpdf/qpdf/QPDF_Unresolved.hh index 80d27102..efcf4e3d 100644 --- a/libqpdf/qpdf/QPDF_Unresolved.hh +++ b/libqpdf/qpdf/QPDF_Unresolved.hh @@ -7,9 +7,8 @@ class QPDF_Unresolved: public QPDFValue { public: virtual ~QPDF_Unresolved() = default; - static std::shared_ptr<QPDFValueProxy> - create(QPDF* qpdf, QPDFObjGen const& og); - virtual std::shared_ptr<QPDFValueProxy> shallowCopy(); + static std::shared_ptr<QPDFObject> create(QPDF* qpdf, QPDFObjGen const& og); + virtual std::shared_ptr<QPDFObject> shallowCopy(); virtual std::string unparse(); virtual JSON getJSON(int json_version); |