forked from bartvdbraak/blender
Documentation for functions inside tracking.c
Additional changes: - Cleaned up sources to reduce mess in some big functions. - Removed unused function from libmv c-api. - Made functions naming more consistent. - Use bool for internal stuff in tracking.c. Shall be no functional changes :)
This commit is contained in:
parent
bbd533d4ac
commit
beb73831f6
23
extern/libmv/libmv-capi.cpp
vendored
23
extern/libmv/libmv-capi.cpp
vendored
@ -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;
|
||||
|
||||
|
6
extern/libmv/libmv-capi.h
vendored
6
extern/libmv/libmv-capi.h
vendored
@ -101,8 +101,6 @@ typedef struct libmv_reconstructionOptions {
|
||||
|
||||
typedef void (*reconstruct_progress_update_cb) (void *customdata, double progress, const char *message);
|
||||
|
||||
int libmv_refineParametersAreValid(int parameters);
|
||||
|
||||
struct libmv_Reconstruction *libmv_solveReconstruction(struct libmv_Tracks *libmv_tracks,
|
||||
libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options,
|
||||
libmv_reconstructionOptions *libmv_reconstruction_options,
|
||||
@ -161,9 +159,9 @@ void libmv_CameraIntrinsicsDistortFloat(struct libmv_CameraIntrinsics *libmv_int
|
||||
float *src, float *dst, int width, int height, float overscan, int channels);
|
||||
|
||||
/* 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);
|
||||
void libmv_InvertIntrinsics(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options,
|
||||
void libmv_InvertCameraIntrinsics(libmv_cameraIntrinsicsOptions *libmv_camera_intrinsics_options,
|
||||
double x, double y, double *x1, double *y1);
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user