diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2022-05-20 13:25:54 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2022-05-20 15:16:25 +0200 |
| commit | dc8df962d8f0d93595a4e036bb29bc3498abc35f (patch) | |
| tree | dc0d45d7fe2d1e1a29b1b5d84e9e5c73ce72d51a /libqpdf/QPDFJob_config.cc | |
| parent | 907df2c823710319e53c0ba6583a1ede4ee5413d (diff) | |
| download | qpdf-dc8df962d8f0d93595a4e036bb29bc3498abc35f.tar.zst | |
Make version default to latest for --json-output (like --json)
Diffstat (limited to 'libqpdf/QPDFJob_config.cc')
| -rw-r--r-- | libqpdf/QPDFJob_config.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libqpdf/QPDFJob_config.cc b/libqpdf/QPDFJob_config.cc index ecdeafe3..6b72103b 100644 --- a/libqpdf/QPDFJob_config.cc +++ b/libqpdf/QPDFJob_config.cc @@ -295,14 +295,14 @@ QPDFJob::Config::jsonInput() QPDFJob::Config* QPDFJob::Config::jsonOutput(std::string const& parameter) { - std::string v = parameter; - if (parameter == "latest") { - v = "2"; + if (parameter.empty() || (parameter == "latest")) { + o.m->json_output = JSON::LATEST; + } else { + o.m->json_output = QUtil::string_to_int(parameter.c_str()); } - if (v != "2") { - usage("only version 2 is supported for --json-output"); + if ((o.m->json_output < 2) || (o.m->json_output > JSON::LATEST)) { + usage(std::string("unsupported json output version ") + parameter); } - o.m->json_output = QUtil::string_to_int(v.c_str()); if (!o.m->json_stream_data_set) { // No need to set json_stream_data_set -- that indicates // explicit use of --json-stream-data. |