OpenSystemsDevelopment / qpdf

Commit a615985865ca73249a7b21e2f28b440cb6c16636

Authored by Jay Berkenbilt
1 parent 9dcd25a0

Update QPDFObject with comment 

Also, since it's just there for compatibility, we don't need to add
new object types to it.
Inline Side-by-side
Showing 2 changed files with 7 additions and 2 deletions
include/qpdf/QPDFObject.hh
  View file @a615985
... ... @@ -22,6 +22,12 @@
22 22 #ifndef QPDFOBJECT_HH
23 23 #define QPDFOBJECT_HH
24 24  
  25 +// ABI: in qpdf 12, leave this file in place and have it generate an
  26 +// error. This is to prevent someone from being able to successfully
  27 +// include this file and get a copy from a previous installation
  28 +// thereby accidentally creating sources depend on having an older
  29 +// version installed.
  30 +
25 31 #ifndef QPDF_OBJECT_NOWARN
26 32 // ABI: remove this file in qpdf 12
27 33 # warning "QPDFObject.hh is deprecated see comments in QPDFObject.hh"
... ... @@ -53,7 +59,6 @@ class QPDFObject
53 59 static constexpr object_type_e ot_stream = ::ot_stream;
54 60 static constexpr object_type_e ot_operator = ::ot_operator;
55 61 static constexpr object_type_e ot_inlineimage = ::ot_inlineimage;
56   - static constexpr object_type_e ot_unresolved = ::ot_unresolved;
57 62  
58 63 private:
59 64 QPDFObject() = delete;
... ...
qpdf/test_driver.cc
  View file @a615985
... ... @@ -3440,7 +3440,7 @@ runtest(int n, char const* filename1, char const* arg2)
3440 3440 assert(strcmp(uninitialized.getTypeName(), "uninitialized") == 0);
3441 3441  
3442 3442 // ABI: until QPDF 12, spot check deprecated constants
3443   - assert(QPDFObject::ot_unresolved == ::ot_unresolved);
  3443 + assert(QPDFObject::ot_dictionary == ::ot_dictionary);
3444 3444 assert(QPDFObject::ot_uninitialized == ::ot_uninitialized);
3445 3445 }
3446 3446  
... ...