diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2022-09-08 14:00:37 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2022-09-08 16:19:38 +0200 |
| commit | a615985865ca73249a7b21e2f28b440cb6c16636 (patch) | |
| tree | 7ae20d30bdaa3e2bdef6d5a28e126d763ee8976b | |
| parent | 9dcd25a06eae4787332cb808a100b338887c9426 (diff) | |
| download | qpdf-a615985865ca73249a7b21e2f28b440cb6c16636.tar.zst | |
Update QPDFObject with comment
Also, since it's just there for compatibility, we don't need to add
new object types to it.
| -rw-r--r-- | include/qpdf/QPDFObject.hh | 7 | ||||
| -rw-r--r-- | qpdf/test_driver.cc | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/qpdf/QPDFObject.hh b/include/qpdf/QPDFObject.hh index 8d982775..619f27f6 100644 --- a/include/qpdf/QPDFObject.hh +++ b/include/qpdf/QPDFObject.hh @@ -22,6 +22,12 @@ #ifndef QPDFOBJECT_HH #define QPDFOBJECT_HH +// ABI: in qpdf 12, leave this file in place and have it generate an +// error. This is to prevent someone from being able to successfully +// include this file and get a copy from a previous installation +// thereby accidentally creating sources depend on having an older +// version installed. + #ifndef QPDF_OBJECT_NOWARN // ABI: remove this file in qpdf 12 # warning "QPDFObject.hh is deprecated see comments in QPDFObject.hh" @@ -53,7 +59,6 @@ class QPDFObject static constexpr object_type_e ot_stream = ::ot_stream; static constexpr object_type_e ot_operator = ::ot_operator; static constexpr object_type_e ot_inlineimage = ::ot_inlineimage; - static constexpr object_type_e ot_unresolved = ::ot_unresolved; private: QPDFObject() = delete; diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc index 4440bfae..46dda0d0 100644 --- a/qpdf/test_driver.cc +++ b/qpdf/test_driver.cc @@ -3440,7 +3440,7 @@ runtest(int n, char const* filename1, char const* arg2) assert(strcmp(uninitialized.getTypeName(), "uninitialized") == 0); // ABI: until QPDF 12, spot check deprecated constants - assert(QPDFObject::ot_unresolved == ::ot_unresolved); + assert(QPDFObject::ot_dictionary == ::ot_dictionary); assert(QPDFObject::ot_uninitialized == ::ot_uninitialized); } |