diff options
| -rw-r--r-- | libqpdf/Buffer.cc | 5 | ||||
| -rw-r--r-- | libqpdf/QPDF.cc | 8 | ||||
| -rw-r--r-- | libqpdf/QPDF_linearization.cc | 3 |
3 files changed, 7 insertions, 9 deletions
diff --git a/libqpdf/Buffer.cc b/libqpdf/Buffer.cc index 45b2119a..ae04fbc8 100644 --- a/libqpdf/Buffer.cc +++ b/libqpdf/Buffer.cc @@ -56,7 +56,7 @@ Buffer::Buffer(Buffer&& rhs) noexcept : Buffer& Buffer::operator=(Buffer&& rhs) noexcept { - std::swap(this->m, rhs.m); + std::swap(m, rhs.m); return *this; } @@ -64,8 +64,7 @@ void Buffer::copy(Buffer const& rhs) { if (this != &rhs) { - this->m = - std::unique_ptr<Members>(new Members(rhs.m->size, nullptr, true)); + m = std::unique_ptr<Members>(new Members(rhs.m->size, nullptr, true)); if (m->size) { memcpy(m->buf, rhs.m->buf, m->size); } diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index 395fe42b..fba5380a 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -2407,10 +2407,10 @@ QPDF::getVersionAsPDFVersion() int extension_level = getExtensionLevel(); std::regex v("^[[:space:]]*([0-9]+)\\.([0-9]+)"); - std::smatch m; - if (std::regex_search(this->m->pdf_version, m, v)) { - major = QUtil::string_to_int(m[1].str().c_str()); - minor = QUtil::string_to_int(m[2].str().c_str()); + std::smatch match; + if (std::regex_search(m->pdf_version, match, v)) { + major = QUtil::string_to_int(match[1].str().c_str()); + minor = QUtil::string_to_int(match[2].str().c_str()); } return PDFVersion(major, minor, extension_level); diff --git a/libqpdf/QPDF_linearization.cc b/libqpdf/QPDF_linearization.cc index e2035b1b..d8742428 100644 --- a/libqpdf/QPDF_linearization.cc +++ b/libqpdf/QPDF_linearization.cc @@ -1462,8 +1462,7 @@ QPDF::calculateLinearizationData(std::map<int, int> const& object_stream_data) // lc_thumbnail_private. } std::set<QPDFObjGen>& ogs = - this->m - ->obj_user_to_objects[ObjUser(ObjUser::ou_thumb, toI(i))]; + m->obj_user_to_objects[ObjUser(ObjUser::ou_thumb, toI(i))]; for (auto const& og: ogs) { if (lc_thumbnail_private.count(og)) { lc_thumbnail_private.erase(og); |