diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-18 11:09:07 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-18 11:09:07 +0400 |
| commit | c11ca1dc0043d80e0ede753492d26f48eca1e8d7 (patch) | |
| tree | 2b454bfd9c7c1f70e5cddaa337ea68c604ae6ea3 /extern/libmv | |
| parent | 41392dccf0322b0d1dadc3d8e32656815ac87aec (diff) | |
Libmv: fixed wrong function prototypes
Also mark non-public functions as static.
Diffstat (limited to 'extern/libmv')
| -rw-r--r-- | extern/libmv/libmv-capi.cpp | 4 | ||||
| -rw-r--r-- | extern/libmv/libmv-capi.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/extern/libmv/libmv-capi.cpp b/extern/libmv/libmv-capi.cpp index 3d3b7398c9b..0f73234f49c 100644 --- a/extern/libmv/libmv-capi.cpp +++ b/extern/libmv/libmv-capi.cpp @@ -523,7 +523,7 @@ int libmv_refineParametersAreValid(int parameters) { LIBMV_REFINE_RADIAL_DISTORTION_K1)); } -void libmv_solveRefineIntrinsics(libmv::Tracks *tracks, libmv::CameraIntrinsics *intrinsics, +static void libmv_solveRefineIntrinsics(libmv::Tracks *tracks, libmv::CameraIntrinsics *intrinsics, libmv::EuclideanReconstruction *reconstruction, int refine_intrinsics, reconstruct_progress_update_cb progress_update_callback, void *callback_customdata) { @@ -1027,7 +1027,7 @@ void libmv_InvertIntrinsics(double focal_length, double principal_x, double prin /* ************ point clouds ************ */ -void libmvTransformToMat4(libmv::Mat3 &R, libmv::Vec3 &S, libmv::Vec3 &t, double M[4][4]) +static void libmvTransformToMat4(libmv::Mat3 &R, libmv::Vec3 &S, libmv::Vec3 &t, double M[4][4]) { for (int j = 0; j < 3; ++j) for (int k = 0; k < 3; ++k) diff --git a/extern/libmv/libmv-capi.h b/extern/libmv/libmv-capi.h index fc3b6f94f62..5253ba76a21 100644 --- a/extern/libmv/libmv-capi.h +++ b/extern/libmv/libmv-capi.h @@ -147,14 +147,14 @@ void libmv_CameraIntrinsicsDistortFloat(struct libmv_CameraIntrinsics *libmvIntr /* dsitortion */ void libmv_undistortByte(double focal_length, double principal_x, double principal_y, double k1, double k2, double k3, - unsigned char *src, unsigned char *dst, int width, int height, int channels); + unsigned char *src, unsigned char *dst, int width, int height, float overscan, int channels); void libmv_undistortFloat(double focal_length, double principal_x, double principal_y, double k1, double k2, double k3, - float *src, float *dst, int width, int height, int channels); + float *src, float *dst, int width, int height, float overscan, int channels); void libmv_distortByte(double focal_length, double principal_x, double principal_y, double k1, double k2, double k3, - unsigned char *src, unsigned char *dst, int width, int height, int channels); + unsigned char *src, unsigned char *dst, int width, int height, float overscan, int channels); void libmv_distortFloat(double focal_length, double principal_x, double principal_y, double k1, double k2, double k3, - float *src, float *dst, int width, int height, int channels); + float *src, float *dst, int width, int height, float overscan, int channels); /* utils */ void libmv_applyCameraIntrinsics(double focal_length, double principal_x, double principal_y, double k1, double k2, double k3, |