mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-25 22:57:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix self converTo.

Browse Source 
We still need images[i] = img because it is used below in buildPyramid.
This commit is contained in:
Vincent Rabaud 2022-12-21 18:28:26 +01:00
parent 3ff1ec99ac
commit b774753922
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/photo/src/merge.cpp
View File

@ -176,16 +176,16 @@ public:
parallel_for_(Range(0, static_cast<int>(images.size())), [&](const Range& range) { parallel_for_(Range(0, static_cast<int>(images.size())), [&](const Range& range) {
for(int i = range.start; i < range.end; i++) { for(int i = range.start; i < range.end; i++) {
Mat& img = images[i]; Mat img, gray, contrast, saturation, wellexp;
Mat gray, contrast, saturation, wellexp;
std::vector<Mat> splitted(channels); std::vector<Mat> splitted(channels);
img.convertTo(img, CV_32F, 1.0f/255.0f); images[i].convertTo(img, CV_32F, 1.0f/255.0f);
if(channels == 3) { if(channels == 3) {
cvtColor(img, gray, COLOR_RGB2GRAY); cvtColor(img, gray, COLOR_RGB2GRAY);
} else { } else {
img.copyTo(gray); img.copyTo(gray);
} }
images[i] = img;
split(img, splitted); split(img, splitted);
Laplacian(gray, contrast, CV_32F); Laplacian(gray, contrast, CV_32F);