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

TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.

Browse Source
This commit is contained in:
Andreas Stührk 2014-10-19 01:22:04 +02:00
parent 63ac69cadf
commit cfdcf9f2d2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,7 +214,8 @@ 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;
AutoBuffer<uchar> _buffer( size_t(8) * tile_height0*tile_width0); const size_t buffer_size = bpp * ncn * tile_height0 * tile_width0;
AutoBuffer<uchar> _buffer( buffer_size );
uchar* buffer = _buffer; uchar* buffer = _buffer;
ushort* buffer16 = (ushort*)buffer; ushort* buffer16 = (ushort*)buffer;
float* buffer32 = (float*)buffer; float* buffer32 = (float*)buffer;