diff options
author | Jay Berkenbilt <ejb@ql.org> | 2021-02-11 12:51:21 +0100 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2021-02-11 20:26:55 +0100 |
commit | 8fbc8579f2481dc3eeb962e99522047291e16fbe (patch) | |
tree | e7bffe25a0ffacc3495012e1e42e87a5e5fdb20b /libqpdf | |
parent | df067c9ab68dd4913a1591f048d9baf4f1c8d09c (diff) | |
download | qpdf-8fbc8579f2481dc3eeb962e99522047291e16fbe.tar.zst |
Allow zone information to be omitted from timestamp strings
Diffstat (limited to 'libqpdf')
-rw-r--r-- | libqpdf/QUtil.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc index 39d21ea0..4b86c0d4 100644 --- a/libqpdf/QUtil.cc +++ b/libqpdf/QUtil.cc @@ -898,7 +898,7 @@ QUtil::pdf_time_to_qpdf_time(std::string const& str, QPDFTime* qtm) { static std::regex pdf_date("^D:([0-9]{4})([0-9]{2})([0-9]{2})" "([0-9]{2})([0-9]{2})([0-9]{2})" - "(?:(Z)|([\\+\\-])([0-9]{2})'([0-9]{2})')$"); + "(?:(Z?)|([\\+\\-])([0-9]{2})'([0-9]{2})')$"); std::smatch m; if (! std::regex_match(str, m, pdf_date)) { @@ -909,7 +909,7 @@ QUtil::pdf_time_to_qpdf_time(std::string const& str, QPDFTime* qtm) return QUtil::string_to_int(s.c_str()); }; - if (m[7] == "") + if (m[8] != "") { tz_delta = ((to_i(m[9]) * 60) + to_i(m[10])); |