Don't allocate lots of memory when reading TIFFs with infinite rows per strip.

Some TIFF images consist of only one strip. The magic value 2**32-1 for the
"rows per strip" tag reflects that fact, effectively meaning "infinite".
This commit is contained in:
Andreas Stührk
2014-10-08 23:31:30 +02:00
parent a77a2f357c
commit afb164cc15
2 changed files with 35 additions and 1 deletions

View File

@@ -210,7 +210,8 @@ bool TiffDecoder::readData( Mat& img )
if( tile_width0 <= 0 )
tile_width0 = m_width;
if( tile_height0 <= 0 )
if( tile_height0 <= 0 ||
(!is_tiled && tile_height0 == std::numeric_limits<uint32>::max()) )
tile_height0 = m_height;
AutoBuffer<uchar> _buffer( size_t(8) * tile_height0*tile_width0);