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

2026-09-15 07:29:07 -05:00 · 2021-06-03 16:23:36 +00:00
parent 0e8431d17b c34445a496
commit 3e513ee6ab
48 changed files with 1176 additions and 713 deletions
--- a/modules/imgcodecs/src/grfmt_exr.cpp
+++ b/modules/imgcodecs/src/grfmt_exr.cpp
@@ -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;