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

Merge pull request #12458 from DEEPIR:3.4

Browse Source 
* may be an typo fix

* remove identical branch,may be paste error

* add parentheses around macro parameter

* simplify if condition

* check malloc fail

* change the condition of branch removed by commit 3041502861
This commit is contained in:
cyy
2018-09-07 23:43:47 +08:00
committed by Alexander Alekhin
parent 875de75327
commit 286c2c236b
8 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgcodecs/src/grfmt_webp.cpp
+2 -2
View File
@@ -207,9 +207,9 @@ bool WebPDecoder::readData(Mat &img)
{
cvtColor(read_img, img, COLOR_BGRA2BGR);
}
else if (img.type() == CV_8UC3 && m_type == CV_8UC4)
else if (img.type() == CV_8UC4 && m_type == CV_8UC3)
{
cvtColor(read_img, img, COLOR_BGRA2BGR);
cvtColor(read_img, img, COLOR_BGR2BGRA);
}
else
{