archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Libmv: Remove array access from camera intrinsics

Browse Source 
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.
This commit is contained in:
Sergey Sharybin
2020-10-12 14:59:18 +02:00
parent ff5e3d6834
commit c4c8d855c6
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
intern/libmv/libmv/simple_pipeline/camera_intrinsics.h
View File

@@ -146,10 +146,6 @@ class CameraIntrinsics {
double principal_point_x() const { return K_(0, 2); } double principal_point_x() const { return K_(0, 2); }
double principal_point_y() const { return K_(1, 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. // Set the image size in pixels.
// Image is the size of image camera intrinsics were calibrated with. // Image is the size of image camera intrinsics were calibrated with.
void SetImageSize(int width, int height); void SetImageSize(int width, int height);
@@ -296,10 +292,6 @@ class PolynomialCameraIntrinsics : public CameraIntrinsics {
return DISTORTION_MODEL_POLYNOMIAL; 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 k1() const { return parameters_[OFFSET_K1]; }
double k2() const { return parameters_[OFFSET_K2]; } double k2() const { return parameters_[OFFSET_K2]; }
double k3() const { return parameters_[OFFSET_K3]; } double k3() const { return parameters_[OFFSET_K3]; }
@@ -359,10 +351,6 @@ class DivisionCameraIntrinsics : public CameraIntrinsics {
return DISTORTION_MODEL_DIVISION; 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 k1() const { return parameters_[OFFSET_K1]; }
double k2() const { return parameters_[OFFSET_K2]; } double k2() const { return parameters_[OFFSET_K2]; }
@@ -413,10 +401,6 @@ class NukeCameraIntrinsics : public CameraIntrinsics {
return DISTORTION_MODEL_NUKE; 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 k1() const { return parameters_[OFFSET_K1]; }
double k2() const { return parameters_[OFFSET_K2]; } double k2() const { return parameters_[OFFSET_K2]; }
@@ -471,10 +455,6 @@ class BrownCameraIntrinsics : public CameraIntrinsics {
return DISTORTION_MODEL_BROWN; 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 k1() const { return parameters_[OFFSET_K1]; }
double k2() const { return parameters_[OFFSET_K2]; } double k2() const { return parameters_[OFFSET_K2]; }
double k3() const { return parameters_[OFFSET_K3]; } double k3() const { return parameters_[OFFSET_K3]; }