Commit 5303130cf920ad9242bd1bb5ad998a791eb7e205
1 parent
53ba65eb
Fix comment on duplicated top-level json keys
Showing
3 changed files
with
10 additions
and
8 deletions
job.sums
| 1 | 1 | # Generated by generate_auto_job |
| 2 | 2 | generate_auto_job 019081046f1bc19f498134eae00344ecfc65b4e52442ee5f1bc80bff99689443 |
| 3 | -job.yml 8e5b3fe5a6abea64a5a33977c440a7ac9ecc4516d2a131ed38fd4bc1a73445d7 | |
| 3 | +job.yml 25c85cba1ae01dac9cd0f9cb7b734e7e3e531c0023ea2b892dc0d40bda1c1146 | |
| 4 | 4 | libqpdf/qpdf/auto_job_decl.hh 97395ecbe590b23ae04d6cce2080dbd0e998917ff5eeaa5c6aafa91041d3cd6a |
| 5 | 5 | libqpdf/qpdf/auto_job_init.hh 465bf46769559ceb77110d1b9d3293ba9b3595850b49848c31aeabd10aadb4ad | ... | ... |
job.yml
| ... | ... | @@ -29,7 +29,9 @@ choices: |
| 29 | 29 | |
| 30 | 30 | - screen |
| 31 | 31 | json_key: |
| 32 | - # QXXXQ duplicated top-level json keys | |
| 32 | + # The list of selectable top-level keys id duplicated in the | |
| 33 | + # following places: job.yml, QPDFJob::json_schema, and | |
| 34 | + # QPDFJob::doJSON. | |
| 33 | 35 | - acroform |
| 34 | 36 | - attachments |
| 35 | 37 | - encrypt | ... | ... |
libqpdf/QPDFJob.cc
| ... | ... | @@ -1469,9 +1469,9 @@ QPDFJob::json_schema(std::set<std::string>* keys) |
| 1469 | 1469 | |
| 1470 | 1470 | bool all_keys = ((keys == 0) || keys->empty()); |
| 1471 | 1471 | |
| 1472 | - // QXXXQ | |
| 1473 | - // The list of selectable top-level keys id duplicated in three | |
| 1474 | - // places: json_schema, doJSON, and initOptionTable. | |
| 1472 | + // The list of selectable top-level keys id duplicated in the | |
| 1473 | + // following places: job.yml, QPDFJob::json_schema, and | |
| 1474 | + // QPDFJob::doJSON. | |
| 1475 | 1475 | if (all_keys || keys->count("objects")) |
| 1476 | 1476 | { |
| 1477 | 1477 | schema.addDictionaryMember( |
| ... | ... | @@ -1809,9 +1809,9 @@ QPDFJob::doJSON(QPDF& pdf) |
| 1809 | 1809 | "decodelevel", JSON::makeString(decode_level_str)); |
| 1810 | 1810 | |
| 1811 | 1811 | bool all_keys = o.json_keys.empty(); |
| 1812 | - // QXXXQ | |
| 1813 | - // The list of selectable top-level keys id duplicated in three | |
| 1814 | - // places: json_schema, doJSON, and initOptionTable. | |
| 1812 | + // The list of selectable top-level keys id duplicated in the | |
| 1813 | + // following places: job.yml, QPDFJob::json_schema, and | |
| 1814 | + // QPDFJob::doJSON. | |
| 1815 | 1815 | if (all_keys || o.json_keys.count("objects")) |
| 1816 | 1816 | { |
| 1817 | 1817 | doJSONObjects(pdf, j); | ... | ... |