mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-08 18:13:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

imgcodecs: fix webp IMREAD_GRAYSCALE loading

Browse Source
This commit is contained in:
berak 2017-04-24 11:53:50 +02:00
parent 636ab095b0
commit cbda9b332b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/imgcodecs/src/grfmt_webp.cpp
View File

@ -162,6 +162,8 @@ bool WebPDecoder::readData(Mat &img)
{ {
if( m_width > 0 && m_height > 0 ) if( m_width > 0 && m_height > 0 )
{ {
bool convert_grayscale = (img.type() == CV_8UC1); // IMREAD_GRAYSCALE requested
if (img.cols != m_width || img.rows != m_height || img.type() != m_type) if (img.cols != m_width || img.rows != m_height || img.type() != m_type)
{ {
img.create(m_height, m_width, m_type); img.create(m_height, m_width, m_type);
@ -184,6 +186,10 @@ bool WebPDecoder::readData(Mat &img)
if(res_ptr == out_data) if(res_ptr == out_data)
{ {
if (convert_grayscale)
{
cvtColor(img, img, COLOR_BGR2GRAY);
}
return true; return true;
} }
} }