third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12240 from pasbi:pfm_fix

Browse Source 
* fixed 64-float pfm auto conversion

* removed trailing whitespace
This commit is contained in:
pasbi 2018-08-17 17:53:09 +02:00 committed by Alexander Alekhin
parent e9a1ccb89a
commit 76eb389761
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/imgcodecs/src/grfmt_pfm.cpp
View File

@ -185,7 +185,9 @@ PFMEncoder::~PFMEncoder()
bool PFMEncoder::isFormatSupported(int depth) const bool PFMEncoder::isFormatSupported(int depth) const
{ {
return CV_MAT_DEPTH(depth) == CV_32F || CV_MAT_DEPTH(depth) == CV_8U; // any depth will be converted into 32-bit float.
(void) depth;
return true;
} }
bool PFMEncoder::write(const Mat& img, const std::vector<int>& params) bool PFMEncoder::write(const Mat& img, const std::vector<int>& params)
@ -246,8 +248,8 @@ bool PFMEncoder::write(const Mat& img, const std::vector<int>& params)
rgb_row[x*3+1] = bgr_row[x*3+1]; rgb_row[x*3+1] = bgr_row[x*3+1];
rgb_row[x*3+2] = bgr_row[x*3+0]; rgb_row[x*3+2] = bgr_row[x*3+0];
} }
strm.putBytes( reinterpret_cast<const uchar*>(rgb_row.data()), strm.putBytes( reinterpret_cast<const uchar*>(rgb_row.data()),
static_cast<int>(sizeof(float) * row_size)); static_cast<int>(sizeof(float) * row_size) );
} else if (float_img.channels() == 1) { } else if (float_img.channels() == 1) {
strm.putBytes(float_img.ptr(y), sizeof(float) * float_img.cols); strm.putBytes(float_img.ptr(y), sizeof(float) * float_img.cols);
} }