projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1caca21
)
Allow TIFF min=white PHOTOMETRIC interpretation images to be read unchanged
author
saskatchewancatch
<saskatchewancatch@gmail.com>
Wed, 6 Sep 2017 03:43:33 +0000
(21:43 -0600)
committer
GitHub
<noreply@github.com>
Wed, 6 Sep 2017 03:43:33 +0000
(21:43 -0600)
modules/imgcodecs/src/grfmt_tiff.cpp
patch
|
blob
|
history
diff --git
a/modules/imgcodecs/src/grfmt_tiff.cpp
b/modules/imgcodecs/src/grfmt_tiff.cpp
index
2760aef
..
61f4c64
100644
(file)
--- 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;