[Bf-blender-cvs] [c4c8d855c67] master: Libmv: Remove array access from camera intrinsics

[Sergey Sharybin]

Commit: c4c8d855c67d596498a99b5992d70b83fa9314e9
Author: Sergey Sharybin
Date:   Mon Oct 12 14:59:18 2020 +0200
Branches: master
https://developer.blender.org/rBc4c8d855c67d596498a99b5992d70b83fa9314e9

Libmv: Remove array access from camera intrinsics

That was a suboptimal decision from back in the days, which ended up
being problematic. It is no longer used, so remove it from API making
it so new code does not depend on this weak concept.

===================================================================

M	intern/libmv/libmv/simple_pipeline/camera_intrinsics.h

===================================================================

diff --git a/intern/libmv/libmv/simple_pipeline/camera_intrinsics.h b/intern/libmv/libmv/simple_pipeline/camera_intrinsics.h
index cf0bdb76ccb..90bbc592815 100644
--- a/intern/libmv/libmv/simple_pipeline/camera_intrinsics.h
+++ b/intern/libmv/libmv/simple_pipeline/camera_intrinsics.h
@@ -146,10 +146,6 @@ class CameraIntrinsics {
   double principal_point_x() const { return K_(0, 2); }
   double principal_point_y() const { return K_(1, 2); }
 
-  virtual int num_distortion_parameters() const = 0;
-  virtual double *distortion_parameters() = 0;
-  virtual const double *distortion_parameters() const = 0;
-
   // Set the image size in pixels.
   // Image is the size of image camera intrinsics were calibrated with.
   void SetImageSize(int width, int height);
@@ -296,10 +292,6 @@ class PolynomialCameraIntrinsics : public CameraIntrinsics {
     return DISTORTION_MODEL_POLYNOMIAL;
   }
 
-  int num_distortion_parameters() const { return NUM_PARAMETERS; }
-  double *distortion_parameters() { return parameters_; };
-  const double *distortion_parameters() const { return parameters_; };
-
   double k1() const { return parameters_[OFFSET_K1]; }
   double k2() const { return parameters_[OFFSET_K2]; }
   double k3() const { return parameters_[OFFSET_K3]; }
@@ -359,10 +351,6 @@ class DivisionCameraIntrinsics : public CameraIntrinsics {
     return DISTORTION_MODEL_DIVISION;
   }
 
-  int num_distortion_parameters() const { return NUM_PARAMETERS; }
-  double *distortion_parameters() { return parameters_; };
-  const double *distortion_parameters() const { return parameters_; };
-
   double k1() const { return parameters_[OFFSET_K1]; }
   double k2() const { return parameters_[OFFSET_K2]; }
 
@@ -413,10 +401,6 @@ class NukeCameraIntrinsics : public CameraIntrinsics {
     return DISTORTION_MODEL_NUKE;
   }
 
-  int num_distortion_parameters() const { return NUM_PARAMETERS; }
-  double *distortion_parameters() { return parameters_; };
-  const double *distortion_parameters() const { return parameters_; };
-
   double k1() const { return parameters_[OFFSET_K1]; }
   double k2() const { return parameters_[OFFSET_K2]; }
 
@@ -471,10 +455,6 @@ class BrownCameraIntrinsics : public CameraIntrinsics {
     return DISTORTION_MODEL_BROWN;
   }
 
-  int num_distortion_parameters() const { return NUM_PARAMETERS; }
-  double *distortion_parameters() { return parameters_; };
-  const double *distortion_parameters() const { return parameters_; };
-
   double k1() const { return parameters_[OFFSET_K1]; }
   double k2() const { return parameters_[OFFSET_K2]; }
   double k3() const { return parameters_[OFFSET_K3]; }