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

#2408 patch apply (see pull request at https://github.com/Itseez/opencv/pull/33)

Browse Source
This commit is contained in:
Evgeny Talanin
2012-10-11 14:38:25 +04:00
parent 43e3b83832
commit bd4620f04e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,12 +197,14 @@ bool TiffDecoder::readData( Mat& img )
} }
} }
if( (!is_tiled && if( (!is_tiled) ||
TIFFGetField( tif, TIFFTAG_ROWSPERSTRIP, &tile_height0 )) ||
(is_tiled && (is_tiled &&
TIFFGetField( tif, TIFFTAG_TILEWIDTH, &tile_width0 ) && TIFFGetField( tif, TIFFTAG_TILEWIDTH, &tile_width0 ) &&
TIFFGetField( tif, TIFFTAG_TILELENGTH, &tile_height0 ))) TIFFGetField( tif, TIFFTAG_TILELENGTH, &tile_height0 )))
{ {
if(!is_tiled)
TIFFGetField( tif, TIFFTAG_ROWSPERSTRIP, &tile_height0 );
if( tile_width0 <= 0 ) if( tile_width0 <= 0 )
tile_width0 = m_width; tile_width0 = m_width;