potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #8639 from berak:fix_webp_grayscale

Browse Source
This commit is contained in:
Alexander Alekhin
2017-04-25 10:29:58 +00:00
parent 96aaac186d cbda9b332b
commit c4d4248e49
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgcodecs/src/grfmt_webp.cpp
+6
View File
@@ -162,6 +162,8 @@ bool WebPDecoder::readData(Mat &img)
{
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)
{
img.create(m_height, m_width, m_type);
@@ -184,6 +186,10 @@ bool WebPDecoder::readData(Mat &img)
if(res_ptr == out_data)
{
if (convert_grayscale)
{
cvtColor(img, img, COLOR_BGR2GRAY);
}
return true;
}
}