diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-01 01:18:40 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-01 01:18:40 +0300 |
commit | aa91a36864595dd565be20ac5c9d5ef060de1a69 (patch) | |
tree | 83f63fa69fe4296968907c500c0e20844808f354 | |
parent | bf13f1a2639c68eb32827929bacf9bda396c1a14 (diff) |
Libmv: Code cleanup, avoid C11 feature with structure re-definition
-rw-r--r-- | extern/libmv/intern/autotrack.h | 4 | ||||
-rw-r--r-- | extern/libmv/intern/frame_accessor.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extern/libmv/intern/autotrack.h b/extern/libmv/intern/autotrack.h index 22e530f6b2b..2a4a8f3c97f 100644 --- a/extern/libmv/intern/autotrack.h +++ b/extern/libmv/intern/autotrack.h @@ -27,6 +27,8 @@ #ifndef LIBMV_C_API_AUTOTRACK_H_ #define LIBMV_C_API_AUTOTRACK_H_ +#include "intern/frame_accessor.h" +#include "intern/tracksN.h" #include "intern/track_region.h" #include "intern/region.h" @@ -34,9 +36,7 @@ extern "C" { #endif -typedef struct libmv_FrameAccessor libmv_FrameAccessor; typedef struct libmv_AutoTrack libmv_AutoTrack; -typedef struct libmv_Marker libmv_Marker; typedef struct libmv_AutoTrackOptions { libmv_TrackRegionOptions track_region; diff --git a/extern/libmv/intern/frame_accessor.h b/extern/libmv/intern/frame_accessor.h index 3e77b57c2e9..3e813fe7581 100644 --- a/extern/libmv/intern/frame_accessor.h +++ b/extern/libmv/intern/frame_accessor.h @@ -29,13 +29,13 @@ #include <stdint.h> +#include "intern/image.h" #include "intern/region.h" #ifdef __cplusplus extern "C" { #endif -typedef struct libmv_FloatImage libmv_FloatImage; typedef struct libmv_FrameAccessor libmv_FrameAccessor; typedef struct libmv_FrameTransform libmv_FrameTransform; typedef struct libmv_FrameAccessorUserData libmv_FrameAccessorUserData; |