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

avoid dependency of histmatching on the current demosaic algo

Browse Source 
(by performing an internal demosaicing step in histogram matching. Obviously
this gets slower...)
This commit is contained in:
Alberto Griggio
2018-01-30 00:35:18 +01:00
parent 2f1ab34ef1
commit 4ce9b0f010
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtengine/histmatching.cc
View File

@@ -160,6 +160,8 @@ void RawImageSource::getAutoMatchedToneCurve(std::vector<double> &outCurve)
} }
ProcParams neutral; ProcParams neutral;
neutral.raw.bayersensor.method = RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::FAST);
neutral.raw.xtranssensor.method = RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FAST);
std::unique_ptr<IImage8> source; std::unique_ptr<IImage8> source;
{ {
@@ -205,8 +207,15 @@ void RawImageSource::getAutoMatchedToneCurve(std::vector<double> &outCurve)
} }
PreviewProps pp(cx, cy, fw, fh, skip); PreviewProps pp(cx, cy, fw, fh, skip);
ColorTemp currWB = getWB(); ColorTemp currWB = getWB();
std::unique_ptr<Imagefloat> image(new Imagefloat(int(fw / skip), int(fh / skip))); std::unique_ptr<Imagefloat> image(new Imagefloat(int(fw / skip), int(fh / skip)));
getImage(currWB, TR_NONE, image.get(), pp, neutral.toneCurve, neutral.raw); {
RawImageSource rsrc;
rsrc.load(getFileName());
rsrc.preprocess(neutral.raw, neutral.lensProf, neutral.coarse, false);
rsrc.demosaic(neutral.raw);
rsrc.getImage(currWB, TR_NONE, image.get(), pp, neutral.toneCurve, neutral.raw);
}
// this could probably be made faster -- ideally we would need to just // this could probably be made faster -- ideally we would need to just
// perform the transformation from camera space to the output space // perform the transformation from camera space to the output space