diff options
| author | m-holger <m-holger@kubitscheck.org> | 2022-07-16 12:21:11 +0200 |
|---|---|---|
| committer | m-holger <m-holger@kubitscheck.org> | 2022-07-24 16:41:48 +0200 |
| commit | eeb6162f7620fba49bb141ccd2c715cd829c8e24 (patch) | |
| tree | 60869241401c5c4c673a54f1e00360bbf02a4542 /include | |
| parent | 6f1041afb8e6d1f57169cd4c79f42a7c1ce94da8 (diff) | |
| download | qpdf-eeb6162f7620fba49bb141ccd2c715cd829c8e24.tar.zst | |
Add optional parameter separator to QPDFObjGen::unparse
Also, revert inlining of unparse and operator << from commit 4c6640c in
order to avoid exposing QUtil.
Diffstat (limited to 'include')
| -rw-r--r-- | include/qpdf/QPDFObjGen.hh | 14 | ||||
| -rw-r--r-- | include/qpdf/QPDFObjectHandle.hh | 1 |
2 files changed, 2 insertions, 13 deletions
diff --git a/include/qpdf/QPDFObjGen.hh b/include/qpdf/QPDFObjGen.hh index ba6e169d..19158aeb 100644 --- a/include/qpdf/QPDFObjGen.hh +++ b/include/qpdf/QPDFObjGen.hh @@ -23,7 +23,6 @@ #define QPDFOBJGEN_HH #include <qpdf/DLL.h> -#include <qpdf/QUtil.hh> #include <iostream> // This class represents an object ID and generation pair. It is @@ -69,18 +68,9 @@ class QPDFObjGen return gen; } QPDF_DLL - std::string - unparse() const - { - return QUtil::int_to_string(obj) + "," + QUtil::int_to_string(gen); - } + std::string unparse(char separator = ',') const; QPDF_DLL - friend std::ostream& - operator<<(std::ostream& os, const QPDFObjGen& og) - { - os << og.obj << "," << og.gen; - return os; - } + friend std::ostream& operator<<(std::ostream& os, const QPDFObjGen& og); private: // This class does not use the Members pattern to avoid a memory diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh index 292397d4..804b76c7 100644 --- a/include/qpdf/QPDFObjectHandle.hh +++ b/include/qpdf/QPDFObjectHandle.hh @@ -1584,7 +1584,6 @@ class QPDFObjectHandle bool stop_at_streams); void shallowCopyInternal(QPDFObjectHandle& oh, bool first_level_only); void releaseResolved(); - std::string getObjGenAsStr() const; static void setObjectDescriptionFromInput( QPDFObjectHandle, QPDF*, |