Add camera_defish to PerspCorrection::read/write

This commit is contained in:
Alexander Brock
2023-02-11 23:51:32 +01:00
parent 841e2ff26f
commit f023a90170
2 changed files with 8 additions and 3 deletions

View File

@@ -521,7 +521,7 @@ bool ImProcFunctions::transCoord (int W, int H, const std::vector<Coord2D> &src,
x_d /= params->perspective.camera_scale;
y_d /= params->perspective.camera_scale;
if (true || params->perspective.camera_defish) {
if (params->perspective.camera_defish) {
double const focal_source = params->perspective.camera_focal_length * maxRadius*1351.0/5206.416/6.5;
double focal_dst = focal_source;
x_d /= focal_dst;
@@ -1261,7 +1261,7 @@ void ImProcFunctions::transformGeneral(bool highQuality, Imagefloat *original, I
x_d /= params->perspective.camera_scale;
y_d /= params->perspective.camera_scale;
if (true || params->perspective.camera_defish) {
if (params->perspective.camera_defish) {
double const focal_source = params->perspective.camera_focal_length * maxRadius*1351.0/5206.416/6.5;
double focal_dst = focal_source;
x_d /= focal_dst;
@@ -1513,7 +1513,9 @@ bool ImProcFunctions::needsPerspective () const
params->perspective.projection_shift_horiz ||
params->perspective.projection_shift_vert ||
params->perspective.projection_yaw ||
params->perspective.camera_defish) );
params->perspective.camera_defish ||
params->perspective.camera_scale > 1.0 + 1e-6 ||
params->perspective.camera_scale < 1.0 - 1e-6 ));
}
bool ImProcFunctions::needsGradient () const