Commit cbda9b33 authored by berak's avatar berak

imgcodecs: fix webp IMREAD_GRAYSCALE loading

parent 636ab095
...@@ -162,6 +162,8 @@ bool WebPDecoder::readData(Mat &img) ...@@ -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) ...@@ -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;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment