From 1a3ed1ee8569504bc57bdba07cc4e8b87442767d Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Mon, 31 Jan 2022 07:53:54 -0500 Subject: job json: move deterministic-id into output options --- libqpdf/qpdf/auto_job_json_init.hh | 6 +++--- libqpdf/qpdf/auto_job_schema.hh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libqpdf') diff --git a/libqpdf/qpdf/auto_job_json_init.hh b/libqpdf/qpdf/auto_job_json_init.hh index 3e082b84..68808130 100644 --- a/libqpdf/qpdf/auto_job_json_init.hh +++ b/libqpdf/qpdf/auto_job_json_init.hh @@ -66,6 +66,9 @@ popHandler(); // key: decodeLevel pushKey("decrypt"); addBare([this]() { c_main->decrypt(); }); popHandler(); // key: decrypt +pushKey("deterministicId"); +addBare([this]() { c_main->deterministicId(); }); +popHandler(); // key: deterministicId pushKey("staticAesIv"); addBare([this]() { c_main->staticAesIv(); }); popHandler(); // key: staticAesIv @@ -263,9 +266,6 @@ beginDict(bindJSON(&Handlers::beginOptions), bindBare(&Handlers::endOptions)); / pushKey("allowWeakCrypto"); addBare([this]() { c_main->allowWeakCrypto(); }); popHandler(); // key: allowWeakCrypto -pushKey("deterministicId"); -addBare([this]() { c_main->deterministicId(); }); -popHandler(); // key: deterministicId pushKey("keepFilesOpen"); addChoices(yn_choices, [this](char const* p) { c_main->keepFilesOpen(p); }); popHandler(); // key: keepFilesOpen diff --git a/libqpdf/qpdf/auto_job_schema.hh b/libqpdf/qpdf/auto_job_schema.hh index 2a621ac9..9b85536a 100644 --- a/libqpdf/qpdf/auto_job_schema.hh +++ b/libqpdf/qpdf/auto_job_schema.hh @@ -18,6 +18,7 @@ static constexpr char const* JOB_SCHEMA_DATA = R"({ "recompressFlate": "uncompress and recompress flate", "decodeLevel": "control which streams to uncompress", "decrypt": "remove encryption from input file", + "deterministicId": "generate ID deterministically", "staticAesIv": "use a fixed AES vector", "staticId": "use a fixed document ID", "noOriginalObjectIds": "omit original object IDs in qdf", @@ -93,7 +94,6 @@ static constexpr char const* JOB_SCHEMA_DATA = R"({ }, "options": { "allowWeakCrypto": "allow insecure cryptographic algorithms", - "deterministicId": "generate ID deterministically", "keepFilesOpen": "manage keeping multiple files open", "keepFilesOpenThreshold": "set threshold for keepFilesOpen", "noWarn": "suppress printing of warning messages", -- cgit v1.2.3-54-g00ecf