kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Libmv: Fix clang inconsistent-missing-override warnings.

Browse Source 
Reviewed By: sergey, ankitm

Differential Revision: https://developer.blender.org/D9377
This commit is contained in:
Ivan Perevala 2020-10-29 10:19:06 +01:00 committed by Sergey Sharybin
parent e652ea5ab3
commit cf78053027
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,7 +292,7 @@ class PolynomialCameraIntrinsics : public CameraIntrinsics {
PolynomialCameraIntrinsics(); PolynomialCameraIntrinsics();
PolynomialCameraIntrinsics(const PolynomialCameraIntrinsics &from); PolynomialCameraIntrinsics(const PolynomialCameraIntrinsics &from);
DistortionModelType GetDistortionModelType() const { DistortionModelType GetDistortionModelType() const override {
return DISTORTION_MODEL_POLYNOMIAL; return DISTORTION_MODEL_POLYNOMIAL;
} }
@ -316,7 +316,7 @@ class PolynomialCameraIntrinsics : public CameraIntrinsics {
void ApplyIntrinsics(double normalized_x, void ApplyIntrinsics(double normalized_x,
double normalized_y, double normalized_y,
double *image_x, double *image_x,
double *image_y) const; double *image_y) const override;
// Invert camera intrinsics on the image point to get normalized coordinates. // Invert camera intrinsics on the image point to get normalized coordinates.
// //
@ -325,7 +325,7 @@ class PolynomialCameraIntrinsics : public CameraIntrinsics {
void InvertIntrinsics(double image_x, void InvertIntrinsics(double image_x,
double image_y, double image_y,
double *normalized_x, double *normalized_x,
double *normalized_y) const; double *normalized_y) const override;
virtual void Pack(PackedIntrinsics* packed_intrinsics) const override; virtual void Pack(PackedIntrinsics* packed_intrinsics) const override;
virtual void Unpack(const PackedIntrinsics& packed_intrinsics) override; virtual void Unpack(const PackedIntrinsics& packed_intrinsics) override;
@ -354,7 +354,7 @@ class DivisionCameraIntrinsics : public CameraIntrinsics {
DivisionCameraIntrinsics(); DivisionCameraIntrinsics();
DivisionCameraIntrinsics(const DivisionCameraIntrinsics &from); DivisionCameraIntrinsics(const DivisionCameraIntrinsics &from);
DistortionModelType GetDistortionModelType() const { DistortionModelType GetDistortionModelType() const override {
return DISTORTION_MODEL_DIVISION; return DISTORTION_MODEL_DIVISION;
} }
@ -372,7 +372,7 @@ class DivisionCameraIntrinsics : public CameraIntrinsics {
void ApplyIntrinsics(double normalized_x, void ApplyIntrinsics(double normalized_x,
double normalized_y, double normalized_y,
double *image_x, double *image_x,
double *image_y) const; double *image_y) const override;
// Invert camera intrinsics on the image point to get normalized coordinates. // Invert camera intrinsics on the image point to get normalized coordinates.
// //
@ -381,7 +381,7 @@ class DivisionCameraIntrinsics : public CameraIntrinsics {
void InvertIntrinsics(double image_x, void InvertIntrinsics(double image_x,
double image_y, double image_y,
double *normalized_x, double *normalized_x,
double *normalized_y) const; double *normalized_y) const override;
virtual void Pack(PackedIntrinsics* packed_intrinsics) const override; virtual void Pack(PackedIntrinsics* packed_intrinsics) const override;
virtual void Unpack(const PackedIntrinsics& packed_intrinsics) override; virtual void Unpack(const PackedIntrinsics& packed_intrinsics) override;
@ -407,7 +407,7 @@ class NukeCameraIntrinsics : public CameraIntrinsics {
NukeCameraIntrinsics(); NukeCameraIntrinsics();
NukeCameraIntrinsics(const NukeCameraIntrinsics &from); NukeCameraIntrinsics(const NukeCameraIntrinsics &from);
DistortionModelType GetDistortionModelType() const { DistortionModelType GetDistortionModelType() const override {
return DISTORTION_MODEL_NUKE; return DISTORTION_MODEL_NUKE;
} }
@ -425,7 +425,7 @@ class NukeCameraIntrinsics : public CameraIntrinsics {
void ApplyIntrinsics(double normalized_x, void ApplyIntrinsics(double normalized_x,
double normalized_y, double normalized_y,
double *image_x, double *image_x,
double *image_y) const; double *image_y) const override;
// Invert camera intrinsics on the image point to get normalized coordinates. // Invert camera intrinsics on the image point to get normalized coordinates.
// //
@ -434,7 +434,7 @@ class NukeCameraIntrinsics : public CameraIntrinsics {
void InvertIntrinsics(double image_x, void InvertIntrinsics(double image_x,
double image_y, double image_y,
double *normalized_x, double *normalized_x,
double *normalized_y) const; double *normalized_y) const override;
virtual void Pack(PackedIntrinsics* packed_intrinsics) const override; virtual void Pack(PackedIntrinsics* packed_intrinsics) const override;
virtual void Unpack(const PackedIntrinsics& packed_intrinsics) override; virtual void Unpack(const PackedIntrinsics& packed_intrinsics) override;
@ -464,7 +464,7 @@ class BrownCameraIntrinsics : public CameraIntrinsics {
BrownCameraIntrinsics(); BrownCameraIntrinsics();
BrownCameraIntrinsics(const BrownCameraIntrinsics &from); BrownCameraIntrinsics(const BrownCameraIntrinsics &from);
DistortionModelType GetDistortionModelType() const { DistortionModelType GetDistortionModelType() const override {
return DISTORTION_MODEL_BROWN; return DISTORTION_MODEL_BROWN;
} }
@ -489,7 +489,7 @@ class BrownCameraIntrinsics : public CameraIntrinsics {
void ApplyIntrinsics(double normalized_x, void ApplyIntrinsics(double normalized_x,
double normalized_y, double normalized_y,
double *image_x, double *image_x,
double *image_y) const; double *image_y) const override;
// Invert camera intrinsics on the image point to get normalized coordinates. // Invert camera intrinsics on the image point to get normalized coordinates.
// //
@ -498,7 +498,7 @@ class BrownCameraIntrinsics : public CameraIntrinsics {
void InvertIntrinsics(double image_x, void InvertIntrinsics(double image_x,
double image_y, double image_y,
double *normalized_x, double *normalized_x,
double *normalized_y) const; double *normalized_y) const override;
virtual void Pack(PackedIntrinsics* packed_intrinsics) const override; virtual void Pack(PackedIntrinsics* packed_intrinsics) const override;
virtual void Unpack(const PackedIntrinsics& packed_intrinsics) override; virtual void Unpack(const PackedIntrinsics& packed_intrinsics) override;