Merge branch 'dev' into perspective
Resolve minor conflict in ImProcFunctions::transformGeneral and add new arguments for use of ImProcFunctions::needsTransform in PerspectiveCorrection::autocompute.
This commit is contained in:
@@ -271,7 +271,7 @@ PerspectiveCorrection::Params PerspectiveCorrection::autocompute(ImageSource *sr
|
||||
neutral.distortion = pparams->distortion;
|
||||
neutral.lensProf = pparams->lensProf;
|
||||
ImProcFunctions ipf(&neutral, true);
|
||||
if (ipf.needsTransform()) {
|
||||
if (ipf.needsTransform(w, h, src->getRotateDegree(), src->getMetaData())) {
|
||||
Imagefloat *tmp = new Imagefloat(w, h);
|
||||
ipf.transform(img.get(), tmp, 0, 0, 0, 0, w, h, w, h,
|
||||
src->getMetaData(), src->getRotateDegree(), false);
|
||||
|
Reference in New Issue
Block a user