From 902fd6df71e89127fdf82a1a309c9c24927276c7 Mon Sep 17 00:00:00 2001 From: m-holger Date: Sun, 21 Jan 2024 17:19:40 +0000 Subject: Change Pl_TIFFPredictor::cur_row to std::vector --- libqpdf/Pl_TIFFPredictor.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'libqpdf/Pl_TIFFPredictor.cc') diff --git a/libqpdf/Pl_TIFFPredictor.cc b/libqpdf/Pl_TIFFPredictor.cc index 51594d11..c8e0b5ba 100644 --- a/libqpdf/Pl_TIFFPredictor.cc +++ b/libqpdf/Pl_TIFFPredictor.cc @@ -35,8 +35,7 @@ Pl_TIFFPredictor::Pl_TIFFPredictor( throw std::runtime_error("TIFFPredictor created with invalid columns value"); } this->bytes_per_row = bpr & UINT_MAX; - this->cur_row = QUtil::make_shared_array(this->bytes_per_row); - memset(this->cur_row.get(), 0, this->bytes_per_row); + this->cur_row.assign(this->bytes_per_row, 0); } void @@ -46,19 +45,19 @@ Pl_TIFFPredictor::write(unsigned char const* data, size_t len) size_t offset = 0; while (len >= left) { // finish off current row - memcpy(this->cur_row.get() + this->pos, data + offset, left); + memcpy(this->cur_row.data() + this->pos, data + offset, left); offset += left; len -= left; processRow(); // Prepare for next row - memset(this->cur_row.get(), 0, this->bytes_per_row); + this->cur_row.assign(this->bytes_per_row, 0); left = this->bytes_per_row; this->pos = 0; } if (len) { - memcpy(this->cur_row.get() + this->pos, data + offset, len); + memcpy(this->cur_row.data() + this->pos, data + offset, len); } this->pos += len; } @@ -68,7 +67,7 @@ Pl_TIFFPredictor::processRow() { QTC::TC("libtests", "Pl_TIFFPredictor processRow", (action == a_decode ? 0 : 1)); BitWriter bw(this->getNext()); - BitStream in(this->cur_row.get(), this->bytes_per_row); + BitStream in(this->cur_row.data(), this->bytes_per_row); std::vector prev; for (unsigned int i = 0; i < this->samples_per_pixel; ++i) { long long sample = in.getBitsSigned(this->bits_per_sample); @@ -100,6 +99,6 @@ Pl_TIFFPredictor::finish() processRow(); } this->pos = 0; - memset(this->cur_row.get(), 0, this->bytes_per_row); + this->cur_row.assign(this->bytes_per_row, 0); getNext()->finish(); } -- cgit v1.2.3-70-g09d2