forked from bartvdbraak/blender
Libmv: Silence some warnings about C11 usage
This makes headers a bit less clean (with the anonymous structs mainly and headers inclusion from another header. Makes compilation with clang a bit less noisy.
This commit is contained in:
parent
2040666fd1
commit
5ab4c6b7aa
17
extern/libmv/intern/reconstruction.h
vendored
17
extern/libmv/intern/reconstruction.h
vendored
@ -31,10 +31,11 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct libmv_CameraIntrinsics libmv_CameraIntrinsics;
|
||||
typedef struct libmv_CameraIntrinsicsOptions libmv_CameraIntrinsicsOptions;
|
||||
struct libmv_Tracks;
|
||||
struct libmv_CameraIntrinsics;
|
||||
struct libmv_CameraIntrinsicsOptions;
|
||||
|
||||
typedef struct libmv_Reconstruction libmv_Reconstruction;
|
||||
typedef struct libmv_Tracks libmv_Tracks;
|
||||
|
||||
enum {
|
||||
LIBMV_REFINE_FOCAL_LENGTH = (1 << 0),
|
||||
@ -54,15 +55,15 @@ typedef void (*reconstruct_progress_update_cb) (void* customdata,
|
||||
const char* message);
|
||||
|
||||
libmv_Reconstruction* libmv_solveReconstruction(
|
||||
const libmv_Tracks* libmv_tracks,
|
||||
const libmv_CameraIntrinsicsOptions* libmv_camera_intrinsics_options,
|
||||
const struct libmv_Tracks* libmv_tracks,
|
||||
const struct libmv_CameraIntrinsicsOptions* libmv_camera_intrinsics_options,
|
||||
libmv_ReconstructionOptions* libmv_reconstruction_options,
|
||||
reconstruct_progress_update_cb progress_update_callback,
|
||||
void* callback_customdata);
|
||||
|
||||
libmv_Reconstruction* libmv_solveModal(
|
||||
const libmv_Tracks* libmv_tracks,
|
||||
const libmv_CameraIntrinsicsOptions* libmv_camera_intrinsics_options,
|
||||
const struct libmv_Tracks* libmv_tracks,
|
||||
const struct libmv_CameraIntrinsicsOptions* libmv_camera_intrinsics_options,
|
||||
const libmv_ReconstructionOptions* libmv_reconstruction_options,
|
||||
reconstruct_progress_update_cb progress_update_callback,
|
||||
void* callback_customdata);
|
||||
@ -89,7 +90,7 @@ int libmv_reprojectionCameraForImage(
|
||||
|
||||
double libmv_reprojectionError(const libmv_Reconstruction* libmv_reconstruction);
|
||||
|
||||
libmv_CameraIntrinsics* libmv_reconstructionExtractIntrinsics(
|
||||
struct libmv_CameraIntrinsics* libmv_reconstructionExtractIntrinsics(
|
||||
libmv_Reconstruction *libmv_Reconstruction);
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
4
extern/libmv/intern/track_region.h
vendored
4
extern/libmv/intern/track_region.h
vendored
@ -49,8 +49,8 @@ typedef struct libmv_TrackRegionResult {
|
||||
|
||||
#ifdef __cplusplus
|
||||
namespace libmv {
|
||||
class TrackRegionOptions;
|
||||
class TrackRegionResult;
|
||||
struct TrackRegionOptions;
|
||||
struct TrackRegionResult;
|
||||
}
|
||||
void libmv_configureTrackRegionOptions(
|
||||
const libmv_TrackRegionOptions& options,
|
||||
|
Loading…
Reference in New Issue
Block a user