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

better (local) caching of fattal results in dcrop

Browse Source 
Use new M_HDR todo code instead of using M_RGBCURVE for fattal
(ported from Hombre's commit a9d02a7dca0b5dcd31f642046d94e1663b17c9ff)
This commit is contained in:
Alberto Griggio
2017-11-17 17:46:13 +01:00
parent 1467b858c5
commit 6212d6e0c6
4 changed files with 40 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rtengine/dcrop.cc
View File

@@ -168,7 +168,7 @@ void Crop::update (int todo)
bool needstransform = parent->ipf.needsTransform();
if (todo & (M_INIT | M_LINDENOISE)) {
if (todo & (M_INIT | M_LINDENOISE | M_HDR)) {
MyMutex::MyLock lock (parent->minit); // Also used in improccoord
int tr = getCoarseBitMask (params.coarse);
@@ -691,8 +691,8 @@ void Crop::update (int todo)
createBuffer (cropw, croph);
std::unique_ptr<Imagefloat> fattalCrop;
if ((todo & (M_TRANSFORM | M_RGBCURVE)) && params.fattal.enabled) {
Imagefloat *f = baseCrop;
if ((todo & M_HDR) && params.fattal.enabled) {
Imagefloat *f = origCrop;
int fw = skips(parent->fw, skip);
int fh = skips(parent->fh, skip);
bool need_cropping = false;
@@ -726,18 +726,14 @@ void Crop::update (int todo)
}
}
}
if (f == origCrop) {
fattalCrop.reset(baseCrop->copy());
f = fattalCrop.get();
}
parent->ipf.ToneMapFattal02(f);
// crop back to the size expected by the rest of the pipeline
if (need_cropping) {
Imagefloat *c = new Imagefloat(cropw, croph);
Imagefloat *c = origCrop;
int oy = cropy / skip;
int ox = cropx / skip;
int oy = trafy / skip;
int ox = trafx / skip;
#ifdef _OPENMP
#pragma omp parallel for
#endif
@@ -750,7 +746,6 @@ void Crop::update (int todo)
c->b(y, x) = f->b(cy, cx);
}
}
fattalCrop.reset(c);
baseCrop = c;
} else {
baseCrop = f;