liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

incorporated Floessie's feedback

Browse Source
This commit is contained in:
Alberto Griggio
2018-01-31 08:29:19 +01:00
parent c04150be35
commit fdde31839d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtengine/histmatching.cc
View File

@@ -28,7 +28,6 @@
#include "improcfun.h" #include "improcfun.h"
#include "StopWatch.h" #include "StopWatch.h"
#include <iostream> #include <iostream>
#include <iomanip>
namespace rtengine { namespace rtengine {
@@ -99,7 +98,7 @@ void mappingToCurve(const std::vector<int> &mapping, std::vector<double> &curve)
} }
} }
} }
int step = max(int(mapping.size())/npoints, 1); int step = std::max(int(mapping.size())/npoints, 1);
auto coord = [](int v) -> double { return double(v)/255.0; }; auto coord = [](int v) -> double { return double(v)/255.0; };
auto doit = auto doit =
@@ -207,6 +206,13 @@ void RawImageSource::getAutoMatchedToneCurve(std::vector<double> &outCurve)
double scale; double scale;
int w = fw / skip, h = fh / skip; int w = fw / skip, h = fh / skip;
std::unique_ptr<Thumbnail> thumb(Thumbnail::loadFromRaw(getFileName(), rml, sensor_type, w, h, 1, false, false)); std::unique_ptr<Thumbnail> thumb(Thumbnail::loadFromRaw(getFileName(), rml, sensor_type, w, h, 1, false, false));
if (!thumb) {
if (settings->verbose) {
std::cout << "histogram matching: raw decoding failed, generating a neutral curve" << std::endl;
}
histMatchingCache = outCurve;
return;
}
target.reset(thumb->processImage(neutral, sensor_type, fh / skip, TI_Nearest, getMetaData(), scale, false)); target.reset(thumb->processImage(neutral, sensor_type, fh / skip, TI_Nearest, getMetaData(), scale, false));
int sw = source->getWidth(), sh = source->getHeight(); int sw = source->getWidth(), sh = source->getHeight();
@@ -227,7 +233,7 @@ void RawImageSource::getAutoMatchedToneCurve(std::vector<double> &outCurve)
tw -= cw; tw -= cw;
} }
if (settings->verbose) { if (settings->verbose) {
std::cout << "histogram matching: cropping target to get an aspect ratio of " << std::fixed << std::setprecision(2) << thumb_ratio << ":1, new size is " << tw << "x" << th << std::endl; std::cout << "histogram matching: cropping target to get an aspect ratio of " << round(thumb_ratio * 100)/100.0 << ":1, new size is " << tw << "x" << th << std::endl;
} }
Image8 *tmp = new Image8(tw, th); Image8 *tmp = new Image8(tw, th);