aboutsummaryrefslogtreecommitdiffstats
path: root/libqpdf/Pl_TIFFPredictor.cc
diff options
context:
space:
mode:
authorm-holger <m-holger@kubitscheck.org>2024-01-21 18:19:40 +0100
committerm-holger <m-holger@kubitscheck.org>2024-01-26 21:20:16 +0100
commit902fd6df71e89127fdf82a1a309c9c24927276c7 (patch)
tree8fbc42083565564afba4c06bb8fb05f5ad6ea5f1 /libqpdf/Pl_TIFFPredictor.cc
parent6b80e0f14b296c21d38a92e25af72da9bf5757ae (diff)
downloadqpdf-902fd6df71e89127fdf82a1a309c9c24927276c7.tar.zst
Change Pl_TIFFPredictor::cur_row to std::vector<unsigned char>
Diffstat (limited to 'libqpdf/Pl_TIFFPredictor.cc')
-rw-r--r--libqpdf/Pl_TIFFPredictor.cc13
1 files changed, 6 insertions, 7 deletions
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<unsigned char>(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<long long> 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();
}