Merge pull request opencv#8639 from berak:fix_webp_grayscale

alalek · alalek · commit c4d4248e4916 · 2017-04-25T10:29:59.000Z
diff --git a/modules/imgcodecs/src/grfmt_webp.cpp b/modules/imgcodecs/src/grfmt_webp.cpp
@@ -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;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,8 @@ bool WebPDecoder::readData(Mat &img)`
`162`	`162`	`{`
`163`	`163`	`if( m_width > 0 && m_height > 0 )`
`164`	`164`	`{`
	`165`	`+ bool convert_grayscale = (img.type() == CV_8UC1); // IMREAD_GRAYSCALE requested`
	`166`	`+`
`165`	`167`	`if (img.cols != m_width \|\| img.rows != m_height \|\| img.type() != m_type)`
`166`	`168`	`{`
`167`	`169`	`img.create(m_height, m_width, m_type);`
`@@ -184,6 +186,10 @@ bool WebPDecoder::readData(Mat &img)`
`184`	`186`
`185`	`187`	`if(res_ptr == out_data)`
`186`	`188`	`{`
	`189`	`+ if (convert_grayscale)`
	`190`	`+ {`
	`191`	`+ cvtColor(img, img, COLOR_BGR2GRAY);`
	`192`	`+ }`
`187`	`193`	`return true;`
`188`	`194`	`}`
`189`	`195`	`}`