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;