OpenSystemsDevelopment / qpdf

Commit 49e6365f63f3ad09f04093d421caee04bc042c0d

Authored by m-holger
1 parent 85d78495

Replace 'this->m' with 'm' 

Manual edits for cases not handled by search and replace
Inline Side-by-side
Showing 3 changed files with 7 additions and 9 deletions
libqpdf/Buffer.cc
  View file @49e6365
@@ -56,7 +56,7 @@ Buffer::Buffer(Buffer&& rhs) noexcept : @@ -56,7 +56,7 @@ Buffer::Buffer(Buffer&& rhs) noexcept :
56 Buffer& 56 Buffer&
57 Buffer::operator=(Buffer&& rhs) noexcept 57 Buffer::operator=(Buffer&& rhs) noexcept
58 { 58 {
59 - std::swap(this->m, rhs.m); 59 + std::swap(m, rhs.m);
60 return *this; 60 return *this;
61 } 61 }
62 62
@@ -64,8 +64,7 @@ void @@ -64,8 +64,7 @@ void
64 Buffer::copy(Buffer const& rhs) 64 Buffer::copy(Buffer const& rhs)
65 { 65 {
66 if (this != &rhs) { 66 if (this != &rhs) {
67 - this->m =  
68 - std::unique_ptr<Members>(new Members(rhs.m->size, nullptr, true)); 67 + m = std::unique_ptr<Members>(new Members(rhs.m->size, nullptr, true));
69 if (m->size) { 68 if (m->size) {
70 memcpy(m->buf, rhs.m->buf, m->size); 69 memcpy(m->buf, rhs.m->buf, m->size);
71 } 70 }
libqpdf/QPDF.cc
  View file @49e6365
@@ -2407,10 +2407,10 @@ QPDF::getVersionAsPDFVersion() @@ -2407,10 +2407,10 @@ QPDF::getVersionAsPDFVersion()
2407 int extension_level = getExtensionLevel(); 2407 int extension_level = getExtensionLevel();
2408 2408
2409 std::regex v("^[[:space:]]*([0-9]+)\\.([0-9]+)"); 2409 std::regex v("^[[:space:]]*([0-9]+)\\.([0-9]+)");
2410 - std::smatch m;  
2411 - if (std::regex_search(this->m->pdf_version, m, v)) {  
2412 - major = QUtil::string_to_int(m[1].str().c_str());  
2413 - minor = QUtil::string_to_int(m[2].str().c_str()); 2410 + std::smatch match;
  2411 + if (std::regex_search(m->pdf_version, match, v)) {
  2412 + major = QUtil::string_to_int(match[1].str().c_str());
  2413 + minor = QUtil::string_to_int(match[2].str().c_str());
2414 } 2414 }
2415 2415
2416 return PDFVersion(major, minor, extension_level); 2416 return PDFVersion(major, minor, extension_level);
libqpdf/QPDF_linearization.cc
  View file @49e6365
@@ -1462,8 +1462,7 @@ QPDF::calculateLinearizationData(std::map&lt;int, int&gt; const&amp; object_stream_data) @@ -1462,8 +1462,7 @@ QPDF::calculateLinearizationData(std::map&lt;int, int&gt; const&amp; object_stream_data)
1462 // lc_thumbnail_private. 1462 // lc_thumbnail_private.
1463 } 1463 }
1464 std::set<QPDFObjGen>& ogs = 1464 std::set<QPDFObjGen>& ogs =
1465 - this->m  
1466 - ->obj_user_to_objects[ObjUser(ObjUser::ou_thumb, toI(i))]; 1465 + m->obj_user_to_objects[ObjUser(ObjUser::ou_thumb, toI(i))];
1467 for (auto const& og: ogs) { 1466 for (auto const& og: ogs) {
1468 if (lc_thumbnail_private.count(og)) { 1467 if (lc_thumbnail_private.count(og)) {
1469 lc_thumbnail_private.erase(og); 1468 lc_thumbnail_private.erase(og);