octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-06-05 20:00:53 +00:00
Code Issues Releases Wiki Activity

In Pl_TIFFPredictor remove calls to memcpy

Browse Source 
Instead of overwriting cur_row.data() use clear and insert.
This commit is contained in:
m-holger 2024-01-21 17:57:10 +00:00
parent 902fd6df71
commit 5b7a44e1cc
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libqpdf/Pl_TIFFPredictor.cc
View File

@ -3,10 +3,8 @@
#include <qpdf/BitStream.hh> #include <qpdf/BitStream.hh>
#include <qpdf/BitWriter.hh> #include <qpdf/BitWriter.hh>
#include <qpdf/QTC.hh> #include <qpdf/QTC.hh>
#include <qpdf/QUtil.hh>
#include <climits> #include <climits>
#include <cstring>
#include <stdexcept> #include <stdexcept>
#include <vector> #include <vector>
@ -21,8 +19,7 @@ Pl_TIFFPredictor::Pl_TIFFPredictor(
action(action), action(action),
columns(columns), columns(columns),
samples_per_pixel(samples_per_pixel), samples_per_pixel(samples_per_pixel),
bits_per_sample(bits_per_sample), bits_per_sample(bits_per_sample)
pos(0)
{ {
if (samples_per_pixel < 1) { if (samples_per_pixel < 1) {
throw std::runtime_error("TIFFPredictor created with invalid samples_per_pixel"); throw std::runtime_error("TIFFPredictor created with invalid samples_per_pixel");
@ -35,31 +32,28 @@ Pl_TIFFPredictor::Pl_TIFFPredictor(
throw std::runtime_error("TIFFPredictor created with invalid columns value"); throw std::runtime_error("TIFFPredictor created with invalid columns value");
} }
this->bytes_per_row = bpr & UINT_MAX; this->bytes_per_row = bpr & UINT_MAX;
this->cur_row.assign(this->bytes_per_row, 0);
} }
void void
Pl_TIFFPredictor::write(unsigned char const* data, size_t len) Pl_TIFFPredictor::write(unsigned char const* data, size_t len)
{ {
size_t left = this->bytes_per_row - this->pos; size_t left = this->bytes_per_row - cur_row.size();
size_t offset = 0; size_t offset = 0;
while (len >= left) { while (len >= left) {
// finish off current row // finish off current row
memcpy(this->cur_row.data() + this->pos, data + offset, left); cur_row.insert(cur_row.end(), data + offset, data + offset + left);
offset += left; offset += left;
len -= left; len -= left;
processRow(); processRow();
// Prepare for next row // Prepare for next row
this->cur_row.assign(this->bytes_per_row, 0); this->cur_row.clear();
left = this->bytes_per_row; left = this->bytes_per_row;
this->pos = 0;
} }
if (len) { if (len) {
memcpy(this->cur_row.data() + this->pos, data + offset, len); cur_row.insert(cur_row.end(), data + offset, data + offset + len);
} }
this->pos += len;
} }
void void
@ -94,11 +88,11 @@ Pl_TIFFPredictor::processRow()
void void
Pl_TIFFPredictor::finish() Pl_TIFFPredictor::finish()
{ {
if (this->pos) { if (!cur_row.empty()) {
// write partial row // write partial row
cur_row.insert(cur_row.end(), bytes_per_row - cur_row.size(), 0);
processRow(); processRow();
} }
this->pos = 0; cur_row.clear();
this->cur_row.assign(this->bytes_per_row, 0);
getNext()->finish(); getNext()->finish();
} }

1
libqpdf/qpdf/Pl_TIFFPredictor.hh
View File

@ -34,7 +34,6 @@ class Pl_TIFFPredictor: public Pipeline
unsigned int samples_per_pixel; unsigned int samples_per_pixel;
unsigned int bits_per_sample; unsigned int bits_per_sample;
std::vector<unsigned char> cur_row; std::vector<unsigned char> cur_row;
size_t pos;
}; };
#endif // PL_TIFFPREDICTOR_HH #endif // PL_TIFFPREDICTOR_HH