generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix crash for large BW tif images

Browse Source 
(cherry picked from commit d38fee7599)
This commit is contained in:
Hajo Nils Krabbenhöft
2015-09-16 22:04:42 +02:00
committed by Alexander Smorkalov
parent 7d28541bbe
commit c5d009d6c4
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/highgui/src/grfmt_tiff.cpp
View File

@@ -221,6 +221,11 @@ bool TiffDecoder::readData( Mat& img )
(!is_tiled && tile_height0 == std::numeric_limits<uint32>::max()) ) (!is_tiled && tile_height0 == std::numeric_limits<uint32>::max()) )
tile_height0 = m_height; tile_height0 = m_height;
if(dst_bpp == 8) {
// we will use TIFFReadRGBA* functions, so allocate temporary buffer for 32bit RGBA
bpp = 8;
ncn = 4;
}
const size_t buffer_size = bpp * ncn * tile_height0 * tile_width0; const size_t buffer_size = bpp * ncn * tile_height0 * tile_width0;
AutoBuffer<uchar> _buffer( buffer_size ); AutoBuffer<uchar> _buffer( buffer_size );
uchar* buffer = _buffer; uchar* buffer = _buffer;