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

Move de-fishing code _before_ distortion correction, so de-fishing occurs _after_ distortion correction.

Browse Source
This commit is contained in:
Alexander Brock
2023-02-25 21:59:25 +01:00
parent c29194d2f2
commit 8b51d8297f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtengine/iptransform.cc
View File

@@ -515,10 +515,6 @@ bool ImProcFunctions::transCoord (int W, int H, const std::vector<Coord2D> &src,
break; break;
} }
if (pLCPMap && params->lensProf.useDist) {
pLCPMap->correctDistortion(x_d, y_d, w2, h2);
}
x_d /= params->perspective.camera_scale; x_d /= params->perspective.camera_scale;
y_d /= params->perspective.camera_scale; y_d /= params->perspective.camera_scale;
if (params->perspective.camera_defish) { if (params->perspective.camera_defish) {
@@ -532,6 +528,10 @@ bool ImProcFunctions::transCoord (int W, int H, const std::vector<Coord2D> &src,
y_d *= factor; y_d *= factor;
} }
if (pLCPMap && params->lensProf.useDist) {
pLCPMap->correctDistortion(x_d, y_d, w2, h2);
}
// rotate // rotate
double Dx = x_d * cost - y_d * sint; double Dx = x_d * cost - y_d * sint;
double Dy = x_d * sint + y_d * cost; double Dy = x_d * sint + y_d * cost;
@@ -1253,10 +1253,6 @@ void ImProcFunctions::transformGeneral(bool highQuality, Imagefloat *original, I
break; break;
} }
if (enableLCPDist) {
pLCPMap->correctDistortion(x_d, y_d, w2, h2);
}
x_d /= params->perspective.camera_scale; x_d /= params->perspective.camera_scale;
y_d /= params->perspective.camera_scale; y_d /= params->perspective.camera_scale;
if (params->perspective.camera_defish) { if (params->perspective.camera_defish) {
@@ -1270,6 +1266,10 @@ void ImProcFunctions::transformGeneral(bool highQuality, Imagefloat *original, I
y_d *= factor; y_d *= factor;
} }
if (enableLCPDist) {
pLCPMap->correctDistortion(x_d, y_d, w2, h2);
}
// rotate // rotate
const double Dxc = x_d * cost - y_d * sint; const double Dxc = x_d * cost - y_d * sint;
const double Dyc = x_d * sint + y_d * cost; const double Dyc = x_d * sint + y_d * cost;