Merge pull request #9564 from saskatchewancatch:i9550

b05789ff · Alexander Alekhin · 1caca211 · 4832c24e · b05789ff
Commit b05789ff authored Sep 06, 2017 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

grfmt_tiff.cpp modules/imgcodecs/src/grfmt_tiff.cpp +1 -1

No files found.
--- a/modules/imgcodecs/src/grfmt_tiff.cpp
+++ b/modules/imgcodecs/src/grfmt_tiff.cpp
@@ -235,7 +235,7 @@ bool TiffDecoder::readHeader()
            m_hdr = false;
            if( bpp > 8 &&
-               ((photometric != 2 && photometric != 1) ||
+               ((photometric > 2) ||
                (ncn != 1 && ncn != 3 && ncn != 4)))
                bpp = 8;