diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2022-01-26 21:46:02 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2022-01-30 19:11:03 +0100 |
| commit | f2409f4fca3ace5627e7166f9c27167aab869f2a (patch) | |
| tree | 0154c15671fcfe6757dd1401fe7f40fff6580e60 | |
| parent | 59b775104a4b80aba836163c1530e4117c3ad4bd (diff) | |
| download | qpdf-f2409f4fca3ace5627e7166f9c27167aab869f2a.tar.zst | |
Minor cleanup
| -rwxr-xr-x | generate_auto_job | 1 | ||||
| -rw-r--r-- | include/qpdf/QPDFJob.hh | 4 | ||||
| -rw-r--r-- | job.sums | 2 | ||||
| -rw-r--r-- | libqpdf/QPDFJob.cc | 1 | ||||
| -rw-r--r-- | libqpdf/QPDFJob_argv.cc | 2 | ||||
| -rw-r--r-- | libqpdf/QPDFJob_config.cc | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/generate_auto_job b/generate_auto_job index 7f92a915..a13cc3b2 100755 --- a/generate_auto_job +++ b/generate_auto_job @@ -230,7 +230,6 @@ class Main: f'help for unknown option {option},' f' lineno={lineno}') if option not in self.help_options: - # QXXXQ also need to exclude help table self.jdata[option[2:]]['help'] = short_text print(f'ap.addOptionHelp("{option}", "{topic}",' f' "{short_text}", R"({long_text})");', file=f) diff --git a/include/qpdf/QPDFJob.hh b/include/qpdf/QPDFJob.hh index 1763efac..46ec3d5a 100644 --- a/include/qpdf/QPDFJob.hh +++ b/include/qpdf/QPDFJob.hh @@ -192,8 +192,8 @@ class QPDFJob public: QPDF_DLL PagesConfig& pageSpec(std::string const& filename, - char const* password, - std::string const& range); + std::string const& range, + char const* password = nullptr); # include <qpdf/auto_job_c_pages.hh> @@ -1,5 +1,5 @@ # Generated by generate_auto_job -generate_auto_job 0eaf9d7724199a2a0a57732ea100f2eb55aaa8a1eccea99196190ff4b79fd6e5 +generate_auto_job 207b392d0d199a6cc0e5eb52044e9adbc729323c9a58f9d547605272a0d9b29c include/qpdf/auto_job_c_att.hh ecc3f8f711b486b491e811176362a90c022eb225ff12157df3a10ca021be87b1 include/qpdf/auto_job_c_copy_att.hh caffae3d1faf2cd92a07ba77da638cce31da3e074a047918834195c0f3ed508a include/qpdf/auto_job_c_enc.hh e2e1a163a7ffebbf8af169dc4a28ab00df3b8d229864bca7d203dde8b56f0864 diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc index 8ddf026b..96d0101c 100644 --- a/libqpdf/QPDFJob.cc +++ b/libqpdf/QPDFJob.cc @@ -547,6 +547,7 @@ QPDFJob::parseNumrange(char const* range, int max) void QPDFJob::run() { + checkConfiguration(); std::shared_ptr<QPDF> pdf_ph; try { diff --git a/libqpdf/QPDFJob_argv.cc b/libqpdf/QPDFJob_argv.cc index ea960845..7aa01b63 100644 --- a/libqpdf/QPDFJob_argv.cc +++ b/libqpdf/QPDFJob_argv.cc @@ -356,7 +356,7 @@ ArgParser::argPagesPositional(char* arg) { range = "1-z"; } - this->c_pages->pageSpec(file, this->pages_password, range); + this->c_pages->pageSpec(file, range, this->pages_password); this->accumulated_args.clear(); this->pages_password = nullptr; if (next_file != nullptr) diff --git a/libqpdf/QPDFJob_config.cc b/libqpdf/QPDFJob_config.cc index 032d70d3..f8402a64 100644 --- a/libqpdf/QPDFJob_config.cc +++ b/libqpdf/QPDFJob_config.cc @@ -932,8 +932,8 @@ QPDFJob::PagesConfig::end() QPDFJob::PagesConfig& QPDFJob::PagesConfig::pageSpec(std::string const& filename, - char const* password, - std::string const& range) + std::string const& range, + char const* password) { this->config.o.m->page_specs.push_back( QPDFJob::PageSpec(filename, password, range)); |