sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tiff_reader - fix num_rows logic in read_stripped method ref #3679

Browse source
This commit is contained in:
artemp 2017-06-12 17:52:02 +02:00
parent bc528e4c8f
commit d2627dfad8
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/tiff_reader.cpp
View file

@ -732,7 +732,6 @@ void tiff_reader<T>::read_stripped(std::size_t x0, std::size_t y0, ImageData & i
std::size_t start_y = (y0 / rows_per_strip_) * rows_per_strip_;
std::size_t end_y = std::min(y0 + height, height_);
std::size_t tx0, tx1, ty0, ty1;
tx0 = x0;
tx1 = std::min(width + x0, width_);
std::size_t row = 0;
@ -758,7 +757,7 @@ void tiff_reader<T>::read_stripped(std::size_t x0, std::size_t y0, ImageData & i
if (detail::tiff_reader_traits<ImageData>::reverse)
{
std::size_t num_rows = std::min(end_y - y, static_cast<std::size_t>(rows_per_strip_));
std::size_t num_rows = std::min(height_ - y, static_cast<std::size_t>(rows_per_strip_));
for (std::size_t ty = ty0; ty < ty1; ++ty)
{
// This is in reverse because the TIFFReadRGBAStrip reads are inverted