Add maxobjectid to JSON

2024-05-29 08:20:53 +00:00 · 2022-05-08 12:37:18 -04:00 · 2022-05-08 12:37:18 -04:00 · 2a2f7f1bba
commit 2a2f7f1bba
parent 02e8ef6fd9
28 changed files with 34 additions and 0 deletions
--- a/libqpdf/QPDFJob.cc
+++ b/libqpdf/QPDFJob.cc
@ -1188,6 +1188,12 @@ QPDFJob::doJSONQpdf(Pipeline* p, bool& first, QPDF& pdf)
        p, first_qpdf, "jsonversion", JSON::makeInt(this->m->json_version), 1);
    JSON::writeDictionaryItem(
        p, first_qpdf, "pdfversion", JSON::makeString(pdf.getPDFVersion()), 1);
+    JSON::writeDictionaryItem(
+        p,
+        first_qpdf,
+        "maxobjectid",
+        JSON::makeInt(QIntC::to_longlong(pdf.getObjectCount())),
+        1);
    JSON::writeDictionaryKey(p, first_qpdf, "objects", 1);
    bool first_object = true;
    JSON::writeDictionaryOpen(p, first_object, 2);
@ -1613,6 +1619,7 @@ QPDFJob::json_schema(int json_version, std::set<std::string>* keys)
            schema.addDictionaryMember("qpdf", JSON::parse(R"({
  "jsonversion": "qpdf json output version",
  "pdfversion": "PDF version from PDF header",
+  "maxobjectid": "Highest object ID; needed for adding new objects",
  "objects": {
    "<obj:n n R|trailer>": "json representation of object"
  }
--- a/qpdf/qtest/qpdf/direct-pages-json-objects.out
+++ b/qpdf/qtest/qpdf/direct-pages-json-objects.out
@ -6,6 +6,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 6,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/direct-pages-json-pages.out
+++ b/qpdf/qtest/qpdf/direct-pages-json-pages.out
@ -28,6 +28,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 8,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/image-streams-small-to-json.out
+++ b/qpdf/qtest/qpdf/image-streams-small-to-json.out
@ -6,6 +6,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 30,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-bad-data-json-file-v2.out
+++ b/qpdf/qtest/qpdf/json-bad-data-json-file-v2.out
@ -53,6 +53,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 6,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-bad-data-json-inline-v2.out
+++ b/qpdf/qtest/qpdf/json-bad-data-json-inline-v2.out
@ -53,6 +53,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 6,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-field-types---show-encryption-key-v2.out
+++ b/qpdf/qtest/qpdf/json-field-types---show-encryption-key-v2.out
@ -434,6 +434,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.5",
+    "maxobjectid": 196,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-field-types-v2.out
+++ b/qpdf/qtest/qpdf/json-field-types-v2.out
@ -434,6 +434,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.5",
+    "maxobjectid": 196,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-image-streams-all-file-v2.out
+++ b/qpdf/qtest/qpdf/json-image-streams-all-file-v2.out
@ -6,6 +6,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 30,
    "objects": {
      "obj:12 0 R": {
        "stream": {
--- a/qpdf/qtest/qpdf/json-image-streams-all-v2.out
+++ b/qpdf/qtest/qpdf/json-image-streams-all-v2.out
@ -277,6 +277,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 30,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-image-streams-generalized-file-v2.out
+++ b/qpdf/qtest/qpdf/json-image-streams-generalized-file-v2.out
@ -6,6 +6,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 30,
    "objects": {
      "obj:12 0 R": {
        "stream": {
--- a/qpdf/qtest/qpdf/json-image-streams-generalized-inline-v2.out
+++ b/qpdf/qtest/qpdf/json-image-streams-generalized-inline-v2.out
@ -277,6 +277,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 30,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-image-streams-none-file-v2.out
+++ b/qpdf/qtest/qpdf/json-image-streams-none-file-v2.out
@ -6,6 +6,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 30,
    "objects": {
      "obj:12 0 R": {
        "stream": {
--- a/qpdf/qtest/qpdf/json-image-streams-none-inline-v2.out
+++ b/qpdf/qtest/qpdf/json-image-streams-none-inline-v2.out
@ -277,6 +277,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 30,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-image-streams-small-v2.out
+++ b/qpdf/qtest/qpdf/json-image-streams-small-v2.out
@ -277,6 +277,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 30,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-image-streams-specialized-file-v2.out
+++ b/qpdf/qtest/qpdf/json-image-streams-specialized-file-v2.out
@ -6,6 +6,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 30,
    "objects": {
      "obj:12 0 R": {
        "stream": {
--- a/qpdf/qtest/qpdf/json-image-streams-specialized-inline-v2.out
+++ b/qpdf/qtest/qpdf/json-image-streams-specialized-inline-v2.out
@ -277,6 +277,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 30,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-image-streams-specialized-v2.out
+++ b/qpdf/qtest/qpdf/json-image-streams-specialized-v2.out
@ -277,6 +277,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 30,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-image-streams-v2.out
+++ b/qpdf/qtest/qpdf/json-image-streams-v2.out
@ -277,6 +277,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 30,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-outlines-with-actions-v2.out
+++ b/qpdf/qtest/qpdf/json-outlines-with-actions-v2.out
@ -622,6 +622,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 108,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-outlines-with-old-root-dests-v2.out
+++ b/qpdf/qtest/qpdf/json-outlines-with-old-root-dests-v2.out
@ -727,6 +727,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 107,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-2-v2.out
+++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-2-v2.out
@ -6,6 +6,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 106,
    "objects": {
      "obj:2 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-v2.out
+++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-trailer-v2.out
@ -6,6 +6,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 106,
    "objects": {
      "trailer": {
        "value": {
--- a/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-v2.out
+++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines-qpdf-v2.out
@ -6,6 +6,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 106,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-page-labels-and-outlines-v2.out
+++ b/qpdf/qtest/qpdf/json-page-labels-and-outlines-v2.out
@ -797,6 +797,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 106,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/json-page-labels-num-tree-v2.out
+++ b/qpdf/qtest/qpdf/json-page-labels-num-tree-v2.out
@ -540,6 +540,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 99,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/page_api_2-json-objects.out
+++ b/qpdf/qtest/qpdf/page_api_2-json-objects.out
@ -6,6 +6,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 10,
    "objects": {
      "obj:1 0 R": {
        "value": {
--- a/qpdf/qtest/qpdf/page_api_2-json-pages.out
+++ b/qpdf/qtest/qpdf/page_api_2-json-pages.out
@ -38,6 +38,7 @@
  "qpdf": {
    "jsonversion": 2,
    "pdfversion": "1.3",
+    "maxobjectid": 11,
    "objects": {
      "obj:1 0 R": {
        "value": {