generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoid possible problems with zero values in tone mapping algorithms (http://code.opencv.org/issues/4020)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-05-14 19:32:25 +03:00
parent ffabbfa778
commit 3c7f7de477
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/photo/src/tonemap.cpp
View File

@ -47,6 +47,12 @@
namespace cv namespace cv
{ {
inline void log_(const Mat& src, Mat& dst)
{
max(src, Scalar::all(1e-4), dst);
log(dst, dst);
}
class TonemapImpl : public Tonemap class TonemapImpl : public Tonemap
{ {
public: public:
@ -122,7 +128,7 @@ public:
Mat gray_img; Mat gray_img;
cvtColor(img, gray_img, COLOR_RGB2GRAY); cvtColor(img, gray_img, COLOR_RGB2GRAY);
Mat log_img; Mat log_img;
log(gray_img, log_img); log_(gray_img, log_img);
float mean = expf(static_cast<float>(sum(log_img)[0]) / log_img.total()); float mean = expf(static_cast<float>(sum(log_img)[0]) / log_img.total());
gray_img /= mean; gray_img /= mean;
log_img.release(); log_img.release();
@ -205,7 +211,7 @@ public:
Mat gray_img; Mat gray_img;
cvtColor(img, gray_img, COLOR_RGB2GRAY); cvtColor(img, gray_img, COLOR_RGB2GRAY);
Mat log_img; Mat log_img;
log(gray_img, log_img); log_(gray_img, log_img);
Mat map_img; Mat map_img;
bilateralFilter(log_img, map_img, -1, sigma_color, sigma_space); bilateralFilter(log_img, map_img, -1, sigma_color, sigma_space);
@ -289,7 +295,7 @@ public:
Mat gray_img; Mat gray_img;
cvtColor(img, gray_img, COLOR_RGB2GRAY); cvtColor(img, gray_img, COLOR_RGB2GRAY);
Mat log_img; Mat log_img;
log(gray_img, log_img); log_(gray_img, log_img);
float log_mean = static_cast<float>(sum(log_img)[0] / log_img.total()); float log_mean = static_cast<float>(sum(log_img)[0] / log_img.total());
double log_min, log_max; double log_min, log_max;
@ -383,7 +389,7 @@ public:
Mat gray_img; Mat gray_img;
cvtColor(img, gray_img, COLOR_RGB2GRAY); cvtColor(img, gray_img, COLOR_RGB2GRAY);
Mat log_img; Mat log_img;
log(gray_img, log_img); log_(gray_img, log_img);
std::vector<Mat> x_contrast, y_contrast; std::vector<Mat> x_contrast, y_contrast;
getContrast(log_img, x_contrast, y_contrast); getContrast(log_img, x_contrast, y_contrast);