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

Fix automatic perspective correction for de-fished images.

Browse Source
This commit is contained in:
Alexander Brock 2023-03-04 00:04:42 +01:00
parent e38a36ed9d
commit cb762662be
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/perspectivecorrection.cc
View File

@ -304,14 +304,18 @@ PerspectiveCorrection::Params PerspectiveCorrection::autocompute(ImageSource *sr
// TODO: Ensure image borders of rotated image do not get detected as lines. // TODO: Ensure image borders of rotated image do not get detected as lines.
neutral.rotate = pparams->rotate; neutral.rotate = pparams->rotate;
neutral.distortion = pparams->distortion; neutral.distortion = pparams->distortion;
neutral.perspective.camera_defish = pparams->perspective.camera_defish;
neutral.perspective.camera_focal_length = pparams->perspective.camera_focal_length;
neutral.perspective.camera_crop_factor = pparams->perspective.camera_crop_factor;
neutral.perspective.camera_scale = pparams->perspective.camera_scale;
neutral.lensProf = pparams->lensProf; neutral.lensProf = pparams->lensProf;
ImProcFunctions ipf(&neutral, true); ImProcFunctions ipf(&neutral, true);
if (ipf.needsTransform(w, h, src->getRotateDegree(), src->getMetaData())) { //if (ipf.needsTransform(w, h, src->getRotateDegree(), src->getMetaData())) {
Imagefloat *tmp = new Imagefloat(w, h); Imagefloat *tmp = new Imagefloat(w, h);
ipf.transform(img.get(), tmp, 0, 0, 0, 0, w, h, w, h, ipf.transform(img.get(), tmp, 0, 0, 0, 0, w, h, w, h,
src->getMetaData(), src->getRotateDegree(), false); src->getMetaData(), src->getRotateDegree(), false);
img.reset(tmp); img.reset(tmp);
} //}
// allocate the gui buffer // allocate the gui buffer
g.buf = static_cast<float *>(malloc(sizeof(float) * w * h * 4)); g.buf = static_cast<float *>(malloc(sizeof(float) * w * h * 4));