Move de-fish to distortion

2023-03-22 00:19:26 +01:00
parent 45b7251073
commit f9e2e934df
12 changed files with 96 additions and 57 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -904,7 +904,10 @@ struct RotateParams {
  * Parameters of the distortion correction
  */
 struct DistortionParams {
-    double  amount;
+    static constexpr double DEFAULT_FOCAL_LENGTH = 12;
+    double amount = 0.0;
+    bool defish = false;
+    double focal_length = DEFAULT_FOCAL_LENGTH;

    DistortionParams();

@@ -960,7 +963,6 @@ struct PerspectiveParams {
     * be interpreted with {@link #DEFAULT_CAMERA_CROP_FACTOR}.
     */
    double  camera_crop_factor;
-    bool    camera_defish;
    /**
     * Negative and zero values indicate an unspecified focal length and should
     * be interpreted with {@link #DEFAULT_CAMERA_FOCAL_LENGTH}.