1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

This commit is contained in:
Alexander Alekhin
2021-06-03 16:23:36 +00:00
48 changed files with 1176 additions and 713 deletions
+4
View File
@@ -158,6 +158,10 @@ bool ExrDecoder::readHeader()
else
{
m_green = channels.findChannel( "Y" );
if( !m_green )
{
m_green = channels.findChannel( "Z" ); // Distance of the front of a sample from the viewer
}
if( m_green )
{
m_ischroma = true;