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

bd4620f0 · Evgeny Talanin · 43e3b838 · bd4620f0
Commit bd4620f0 authored Oct 11, 2012 by Evgeny Talanin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

grfmt_tiff.cpp modules/highgui/src/grfmt_tiff.cpp +4 -2

No files found.
--- a/modules/highgui/src/grfmt_tiff.cpp
+++ b/modules/highgui/src/grfmt_tiff.cpp
@@ -197,12 +197,14 @@ bool  TiffDecoder::readData( Mat& img )
            }
        }

-        if( (!is_tiled &&
-            TIFFGetField( tif, TIFFTAG_ROWSPERSTRIP, &tile_height0 )) ||
+        if( (!is_tiled) ||
            (is_tiled &&
            TIFFGetField( tif, TIFFTAG_TILEWIDTH, &tile_width0 ) &&
            TIFFGetField( tif, TIFFTAG_TILELENGTH, &tile_height0 )))
        {
+            if(!is_tiled)
+                TIFFGetField( tif, TIFFTAG_ROWSPERSTRIP, &tile_height0 );
+
            if( tile_width0 <= 0 )
                tile_width0 = m_width;