Copy perspective.method from profile to "neutral" profile so perspective auto-correction works with de-fished images
This commit is contained in:
@@ -308,14 +308,15 @@ PerspectiveCorrection::Params PerspectiveCorrection::autocompute(ImageSource *sr
|
|||||||
neutral.perspective.camera_focal_length = pparams->perspective.camera_focal_length;
|
neutral.perspective.camera_focal_length = pparams->perspective.camera_focal_length;
|
||||||
neutral.perspective.camera_crop_factor = pparams->perspective.camera_crop_factor;
|
neutral.perspective.camera_crop_factor = pparams->perspective.camera_crop_factor;
|
||||||
neutral.perspective.camera_scale = pparams->perspective.camera_scale;
|
neutral.perspective.camera_scale = pparams->perspective.camera_scale;
|
||||||
|
neutral.perspective.method = pparams->perspective.method;
|
||||||
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));
|
||||||
|
Reference in New Issue
Block a user