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

fattal: correctly crop the image to the dimensions required for distortion correction

Browse Source 
Fix for #4187
This commit is contained in:
Alberto Griggio
2017-11-17 21:02:19 +01:00
parent 6212d6e0c6
commit 7b9252be33
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/dcrop.cc
View File

@@ -697,7 +697,7 @@ void Crop::update (int todo)
int fh = skips(parent->fh, skip); int fh = skips(parent->fh, skip);
bool need_cropping = false; bool need_cropping = false;
if (cropx || cropy || trafw != fw || trafh != fh) { if (trafx || trafy || trafw != fw || trafh != fh) {
need_cropping = true; need_cropping = true;
// fattal needs to work on the full image. So here we get the full // fattal needs to work on the full image. So here we get the full
// image from imgsrc, and replace the denoised crop in case // image from imgsrc, and replace the denoised crop in case
@@ -710,8 +710,8 @@ void Crop::update (int todo)
if (params.dirpyrDenoise.enabled) { if (params.dirpyrDenoise.enabled) {
// copy the denoised crop // copy the denoised crop
int oy = cropy / skip; int oy = trafy / skip;
int ox = cropx / skip; int ox = trafx / skip;
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for #pragma omp parallel for
#endif #endif
@@ -737,9 +737,9 @@ void Crop::update (int todo)
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for #pragma omp parallel for
#endif #endif
for (int y = 0; y < croph; ++y) { for (int y = 0; y < trafh; ++y) {
int cy = y + oy; int cy = y + oy;
for (int x = 0; x < cropw; ++x) { for (int x = 0; x < trafw; ++x) {
int cx = x + ox; int cx = x + ox;
c->r(y, x) = f->r(cy, cx); c->r(y, x) = f->r(cy, cx);
c->g(y, x) = f->g(cy, cx); c->g(y, x) = f->g(cy, cx);