diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/qpdf/QPDF.hh | 12 | ||||
-rw-r--r-- | include/qpdf/QPDFObjectHandle.hh | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh index c7ac5281..ea2ca05c 100644 --- a/include/qpdf/QPDF.hh +++ b/include/qpdf/QPDF.hh @@ -842,11 +842,11 @@ class QPDF } }; - // Resolver class is restricted to QPDFValueProxy so that only it + // The Resolver class is restricted to QPDFObject so that only it // can resolve indirect references. class Resolver { - friend class QPDFValueProxy; + friend class QPDFObject; private: static void @@ -952,7 +952,7 @@ class QPDF { } ObjCache( - std::shared_ptr<QPDFValueProxy> object, + std::shared_ptr<QPDFObject> object, qpdf_offset_t end_before_space, qpdf_offset_t end_after_space) : object(object), @@ -961,7 +961,7 @@ class QPDF { } - std::shared_ptr<QPDFValueProxy> object; + std::shared_ptr<QPDFObject> object; qpdf_offset_t end_before_space; qpdf_offset_t end_after_space; }; @@ -1186,12 +1186,12 @@ class QPDF QPDFObjectHandle reserveObjectIfNotExists(QPDFObjGen const& og); QPDFObjectHandle reserveStream(QPDFObjGen const& og); QPDFObjectHandle - newIndirect(QPDFObjGen const&, std::shared_ptr<QPDFValueProxy> const&); + newIndirect(QPDFObjGen const&, std::shared_ptr<QPDFObject> const&); bool isCached(QPDFObjGen const& og); bool isUnresolved(QPDFObjGen const& og); void 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/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh index 07fe3ad5..21f82e58 100644 --- a/include/qpdf/QPDFObjectHandle.hh +++ b/include/qpdf/QPDFObjectHandle.hh @@ -54,7 +54,7 @@ class QPDF_Real; class QPDF_Reserved; class QPDF_Stream; class QPDF_String; -class QPDFValueProxy; +class QPDFObject; class QPDFTokenizer; class QPDFExc; class Pl_QPDFTokenizer; @@ -1493,7 +1493,7 @@ class QPDFObjectHandle private: static QPDFObjectHandle - newIndirect(std::shared_ptr<QPDFValueProxy> const& obj) + newIndirect(std::shared_ptr<QPDFObject> const& obj) { return QPDFObjectHandle(obj); } @@ -1518,7 +1518,7 @@ class QPDFObjectHandle friend class QPDF; private: - static std::shared_ptr<QPDFValueProxy> + static std::shared_ptr<QPDFObject> getObject(QPDFObjectHandle& o) { if (!o.dereference()) { @@ -1617,7 +1617,7 @@ class QPDFObjectHandle bool isImage(bool exclude_imagemask = true); private: - QPDFObjectHandle(std::shared_ptr<QPDFValueProxy> const& obj) : + QPDFObjectHandle(std::shared_ptr<QPDFObject> const& obj) : obj(obj) { } @@ -1671,7 +1671,7 @@ class QPDFObjectHandle // Moving members of QPDFObjectHandle into a smart pointer incurs // a substantial performance penalty since QPDFObjectHandle // objects are copied around so frequently. - std::shared_ptr<QPDFValueProxy> obj; + std::shared_ptr<QPDFObject> obj; }; #ifndef QPDF_NO_QPDF_STRING |