From 2e8b5f290c03bd4cd67f9240cb1fff3122e0b12c Mon Sep 17 00:00:00 2001 From: m-holger Date: Mon, 22 Jan 2024 00:32:15 +0000 Subject: [PATCH] In Pl_TIFFPredictor avoid repeated calls to getNext --- libqpdf/Pl_TIFFPredictor.cc | 7 ++++--- libqpdf/qpdf/Pl_TIFFPredictor.hh | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libqpdf/Pl_TIFFPredictor.cc b/libqpdf/Pl_TIFFPredictor.cc index 7535d38f..5454cfe6 100644 --- a/libqpdf/Pl_TIFFPredictor.cc +++ b/libqpdf/Pl_TIFFPredictor.cc @@ -19,7 +19,8 @@ Pl_TIFFPredictor::Pl_TIFFPredictor( action(action), columns(columns), samples_per_pixel(samples_per_pixel), - bits_per_sample(bits_per_sample) + bits_per_sample(bits_per_sample), + p_next(getNext()) { if (samples_per_pixel < 1) { throw std::runtime_error("TIFFPredictor created with invalid samples_per_pixel"); @@ -58,7 +59,7 @@ void Pl_TIFFPredictor::processRow() { QTC::TC("libtests", "Pl_TIFFPredictor processRow", (action == a_decode ? 0 : 1)); - BitWriter bw(this->getNext()); + BitWriter bw(p_next); BitStream in(this->cur_row.data(), this->bytes_per_row); std::vector prev; for (unsigned int i = 0; i < this->samples_per_pixel; ++i) { @@ -92,5 +93,5 @@ Pl_TIFFPredictor::finish() processRow(); } cur_row.clear(); - getNext()->finish(); + p_next->finish(); } diff --git a/libqpdf/qpdf/Pl_TIFFPredictor.hh b/libqpdf/qpdf/Pl_TIFFPredictor.hh index ba429734..6557e15c 100644 --- a/libqpdf/qpdf/Pl_TIFFPredictor.hh +++ b/libqpdf/qpdf/Pl_TIFFPredictor.hh @@ -34,6 +34,7 @@ class Pl_TIFFPredictor: public Pipeline unsigned int samples_per_pixel; unsigned int bits_per_sample; std::vector cur_row; + Pipeline* p_next; }; #endif // PL_TIFFPREDICTOR_HH