Merge pull request #6689 from abrock/defish

De-fish
2024-09-27 21:48:55 -07:00
parent 1e0265f98c d9886b7b5c
commit f8386306c9
19 changed files with 268 additions and 30 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -929,9 +929,12 @@ struct CoarseTransformParams {
 struct CommonTransformParams {
    Glib::ustring method;
    bool autofill;
+    double scale;

    CommonTransformParams();

+    double getScale() const;
+
    bool operator ==(const CommonTransformParams& other) const;
    bool operator !=(const CommonTransformParams& other) const;
 };
@@ -952,7 +955,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();