diff options
| -rw-r--r-- | include/qpdf/QPDFJob.hh | 6 | ||||
| -rw-r--r-- | libqpdf/QPDFJob.cc | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/include/qpdf/QPDFJob.hh b/include/qpdf/QPDFJob.hh index d153c243..b57ae5b4 100644 --- a/include/qpdf/QPDFJob.hh +++ b/include/qpdf/QPDFJob.hh @@ -159,9 +159,9 @@ class QPDFJob std::string which; char const* filename; char const* password; - char const* to_nr; - char const* from_nr; - char const* repeat_nr; + std::string to_nr; + std::string from_nr; + std::string repeat_nr; std::shared_ptr<QPDF> pdf; std::vector<int> to_pagenos; std::vector<int> from_pagenos; diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc index 233fc5d7..591f306a 100644 --- a/libqpdf/QPDFJob.cc +++ b/libqpdf/QPDFJob.cc @@ -1945,7 +1945,7 @@ QPDFJob::validateUnderOverlay(QPDF& pdf, QPDFJob::UnderOverlay* uo) int uo_npages = QIntC::to_int(uo_pdh.getAllPages().size()); try { - uo->to_pagenos = QUtil::parse_numrange(uo->to_nr, main_npages); + uo->to_pagenos = QUtil::parse_numrange(uo->to_nr.c_str(), main_npages); } catch (std::runtime_error& e) { @@ -1955,16 +1955,17 @@ QPDFJob::validateUnderOverlay(QPDF& pdf, QPDFJob::UnderOverlay* uo) } try { - if (0 == strlen(uo->from_nr)) + if (uo->from_nr.empty()) { QTC::TC("qpdf", "qpdf from_nr from repeat_nr"); uo->from_nr = uo->repeat_nr; } - uo->from_pagenos = QUtil::parse_numrange(uo->from_nr, uo_npages); - if (strlen(uo->repeat_nr)) + uo->from_pagenos = + QUtil::parse_numrange(uo->from_nr.c_str(), uo_npages); + if (! uo->repeat_nr.empty()) { uo->repeat_pagenos = - QUtil::parse_numrange(uo->repeat_nr, uo_npages); + QUtil::parse_numrange(uo->repeat_nr.c_str(), uo_npages); } } catch (std::runtime_error& e) |