Merge pull request #9757 from berak:imgcodecs_4chan_bmp

b872d143 · Alexander Alekhin · a9effeeb · 089aac61 · b872d143
Commit b872d143 authored Oct 02, 2017 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

grfmt_bmp.cpp modules/imgcodecs/src/grfmt_bmp.cpp +4 -2

No files found.
--- a/modules/imgcodecs/src/grfmt_bmp.cpp
+++ b/modules/imgcodecs/src/grfmt_bmp.cpp
@@ -481,8 +481,10 @@ decode_rle8_bad: ;

                if( !color )
                    icvCvt_BGRA2Gray_8u_C4C1R( src, 0, data, 0, cvSize(m_width,1) );
-                else
-                    icvCvt_BGRA2BGR_8u_C4C3R( src, 0, data, 0, cvSize(m_width,1) );
+                else if( img.channels() == 3 )
+                    icvCvt_BGRA2BGR_8u_C4C3R(src, 0, data, 0, cvSize(m_width, 1));
+                else if( img.channels() == 4 )
+                    memcpy(data, src, m_width * 4);
            }
            result = true;
            break;