From a615985865ca73249a7b21e2f28b440cb6c16636 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Thu, 8 Sep 2022 08:00:37 -0400 Subject: [PATCH] Update QPDFObject with comment --- include/qpdf/QPDFObject.hh | 7 ++++++- 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 8d98277..619f27f 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 4440bfa..46dda0d 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); } -- libgit2 0.21.4