diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-01 09:48:24 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-02 11:01:34 +0400 |
| commit | 5ab4c6b7aa65eeb878b016666ca6551548c9bc80 (patch) | |
| tree | 88a921b025b8c027f557bbbd3d4c356beef9a8ea /extern | |
| parent | 2040666fd1526c8ea21f2512dd6750ea11d3dc0c (diff) | |
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.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/intern/reconstruction.h | 17 | ||||
| -rw-r--r-- | extern/libmv/intern/track_region.h | 4 |
2 files changed, 11 insertions, 10 deletions
diff --git a/extern/libmv/intern/reconstruction.h b/extern/libmv/intern/reconstruction.h index 744f4bafb0b..88e810b54aa 100644 --- a/extern/libmv/intern/reconstruction.h +++ b/extern/libmv/intern/reconstruction.h @@ -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 diff --git a/extern/libmv/intern/track_region.h b/extern/libmv/intern/track_region.h index 95ec124c3e1..7ed3e443e40 100644 --- a/extern/libmv/intern/track_region.h +++ b/extern/libmv/intern/track_region.h @@ -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, |