diff options
Diffstat (limited to 'extern/libmv/libmv-capi.cpp')
| -rw-r--r-- | extern/libmv/libmv-capi.cpp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/extern/libmv/libmv-capi.cpp b/extern/libmv/libmv-capi.cpp index 0f2ebc50384..8bb89b8e1ae 100644 --- a/extern/libmv/libmv-capi.cpp +++ b/extern/libmv/libmv-capi.cpp @@ -419,23 +419,6 @@ protected: void *callback_customdata_; }; -int libmv_refineParametersAreValid(int parameters) { - return (parameters == (LIBMV_REFINE_FOCAL_LENGTH)) || - (parameters == (LIBMV_REFINE_FOCAL_LENGTH | - LIBMV_REFINE_PRINCIPAL_POINT)) || - (parameters == (LIBMV_REFINE_FOCAL_LENGTH | - LIBMV_REFINE_PRINCIPAL_POINT | - LIBMV_REFINE_RADIAL_DISTORTION_K1 | - LIBMV_REFINE_RADIAL_DISTORTION_K2)) || - (parameters == (LIBMV_REFINE_FOCAL_LENGTH | - LIBMV_REFINE_RADIAL_DISTORTION_K1 | - LIBMV_REFINE_RADIAL_DISTORTION_K2)) || - (parameters == (LIBMV_REFINE_FOCAL_LENGTH | - LIBMV_REFINE_RADIAL_DISTORTION_K1)) || - (parameters == (LIBMV_REFINE_RADIAL_DISTORTION_K1 | - LIBMV_REFINE_RADIAL_DISTORTION_K2)); -} - 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, @@ -952,7 +935,7 @@ void libmv_CameraIntrinsicsDistortFloat(struct libmv_CameraIntrinsics *libmvIntr /* ************ utils ************ */ -void libmv_applyCameraIntrinsics(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options, +void libmv_ApplyCameraIntrinsics(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options, double x, double y, double *x1, double *y1) { libmv::CameraIntrinsics camera_intrinsics; @@ -966,8 +949,8 @@ void libmv_applyCameraIntrinsics(libmv_cameraIntrinsicsOptions *libmv_camera_int } } -void libmv_InvertIntrinsics(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options, - double x, double y, double *x1, double *y1) +void libmv_InvertCameraIntrinsics(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options, + double x, double y, double *x1, double *y1) { libmv::CameraIntrinsics camera_intrinsics; |