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

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-09-10 00:04:29 +03:00
parent 80610ca054 c35c5a47df
commit dca657a2fd
107 changed files with 492 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgcodecs/src/grfmt_pfm.cpp
+2 -2
View File
@@ -186,13 +186,13 @@ PFMEncoder::~PFMEncoder()
bool PFMEncoder::isFormatSupported(int depth) const
{
// any depth will be converted into 32-bit float.
(void) depth;
CV_UNUSED(depth);
return true;
}
bool PFMEncoder::write(const Mat& img, const std::vector<int>& params)
{
(void) params;
CV_UNUSED(params);
WLByteStream strm;
if (m_buf) {
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
{