Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorIvan Perevala <ivpe>2020-10-29 12:19:06 +0300
committerSergey Sharybin <sergey@blender.org>2020-10-29 12:19:50 +0300
commitcf7805302788bc8503c3976e975dc5b93c70a8b4 (patch)
treee63d851cff0aa491a27ff80fc60575a3233e7c8a /intern
parente652ea5ab3a833926429b486122f6f0707fa7bf4 (diff)
Libmv: Fix clang inconsistent-missing-override warnings.
Reviewed By: sergey, ankitm Differential Revision: https://developer.blender.org/D9377
Diffstat (limited to 'intern')
-rw-r--r--intern/libmv/libmv/simple_pipeline/camera_intrinsics.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/intern/libmv/libmv/simple_pipeline/camera_intrinsics.h b/intern/libmv/libmv/simple_pipeline/camera_intrinsics.h
index 30b0f1abf7b..ba67ec468dc 100644
--- a/intern/libmv/libmv/simple_pipeline/camera_intrinsics.h
+++ b/intern/libmv/libmv/simple_pipeline/camera_intrinsics.h
@@ -292,7 +292,7 @@ class PolynomialCameraIntrinsics : public CameraIntrinsics {
PolynomialCameraIntrinsics();
PolynomialCameraIntrinsics(const PolynomialCameraIntrinsics &from);
- DistortionModelType GetDistortionModelType() const {
+ DistortionModelType GetDistortionModelType() const override {
return DISTORTION_MODEL_POLYNOMIAL;
}
@@ -316,7 +316,7 @@ class PolynomialCameraIntrinsics : public CameraIntrinsics {
void ApplyIntrinsics(double normalized_x,
double normalized_y,
double *image_x,
- double *image_y) const;
+ double *image_y) const override;
// Invert camera intrinsics on the image point to get normalized coordinates.
//
@@ -325,7 +325,7 @@ class PolynomialCameraIntrinsics : public CameraIntrinsics {
void InvertIntrinsics(double image_x,
double image_y,
double *normalized_x,
- double *normalized_y) const;
+ double *normalized_y) const override;
virtual void Pack(PackedIntrinsics* packed_intrinsics) const override;
virtual void Unpack(const PackedIntrinsics& packed_intrinsics) override;
@@ -354,7 +354,7 @@ class DivisionCameraIntrinsics : public CameraIntrinsics {
DivisionCameraIntrinsics();
DivisionCameraIntrinsics(const DivisionCameraIntrinsics &from);
- DistortionModelType GetDistortionModelType() const {
+ DistortionModelType GetDistortionModelType() const override {
return DISTORTION_MODEL_DIVISION;
}
@@ -372,7 +372,7 @@ class DivisionCameraIntrinsics : public CameraIntrinsics {
void ApplyIntrinsics(double normalized_x,
double normalized_y,
double *image_x,
- double *image_y) const;
+ double *image_y) const override;
// Invert camera intrinsics on the image point to get normalized coordinates.
//
@@ -381,7 +381,7 @@ class DivisionCameraIntrinsics : public CameraIntrinsics {
void InvertIntrinsics(double image_x,
double image_y,
double *normalized_x,
- double *normalized_y) const;
+ double *normalized_y) const override;
virtual void Pack(PackedIntrinsics* packed_intrinsics) const override;
virtual void Unpack(const PackedIntrinsics& packed_intrinsics) override;
@@ -407,7 +407,7 @@ class NukeCameraIntrinsics : public CameraIntrinsics {
NukeCameraIntrinsics();
NukeCameraIntrinsics(const NukeCameraIntrinsics &from);
- DistortionModelType GetDistortionModelType() const {
+ DistortionModelType GetDistortionModelType() const override {
return DISTORTION_MODEL_NUKE;
}
@@ -425,7 +425,7 @@ class NukeCameraIntrinsics : public CameraIntrinsics {
void ApplyIntrinsics(double normalized_x,
double normalized_y,
double *image_x,
- double *image_y) const;
+ double *image_y) const override;
// Invert camera intrinsics on the image point to get normalized coordinates.
//
@@ -434,7 +434,7 @@ class NukeCameraIntrinsics : public CameraIntrinsics {
void InvertIntrinsics(double image_x,
double image_y,
double *normalized_x,
- double *normalized_y) const;
+ double *normalized_y) const override;
virtual void Pack(PackedIntrinsics* packed_intrinsics) const override;
virtual void Unpack(const PackedIntrinsics& packed_intrinsics) override;
@@ -464,7 +464,7 @@ class BrownCameraIntrinsics : public CameraIntrinsics {
BrownCameraIntrinsics();
BrownCameraIntrinsics(const BrownCameraIntrinsics &from);
- DistortionModelType GetDistortionModelType() const {
+ DistortionModelType GetDistortionModelType() const override {
return DISTORTION_MODEL_BROWN;
}
@@ -489,7 +489,7 @@ class BrownCameraIntrinsics : public CameraIntrinsics {
void ApplyIntrinsics(double normalized_x,
double normalized_y,
double *image_x,
- double *image_y) const;
+ double *image_y) const override;
// Invert camera intrinsics on the image point to get normalized coordinates.
//
@@ -498,7 +498,7 @@ class BrownCameraIntrinsics : public CameraIntrinsics {
void InvertIntrinsics(double image_x,
double image_y,
double *normalized_x,
- double *normalized_y) const;
+ double *normalized_y) const override;
virtual void Pack(PackedIntrinsics* packed_intrinsics) const override;
virtual void Unpack(const PackedIntrinsics& packed_intrinsics) override;