Commit: 26e440838fe6e638a1e879698b1686d66623cd8b
Author: Sergey Sharybin
Date: Sat Nov 1 02:53:36 2014 +0500
Branches: master
https://developer.blender.org/rB26e440838fe6e638a1e879698b1686d66623cd8b
Libmv: Code cleanup, mixed class/struct in declaration/definition
===================================================================
M extern/libmv/intern/tracksN.h
M extern/libmv/libmv/autotrack/autotrack.h
M extern/libmv/libmv/autotrack/predict_tracks.h
===================================================================
diff --git a/extern/libmv/intern/tracksN.h b/extern/libmv/intern/tracksN.h
index 1366ea2..d0cb54e 100644
--- a/extern/libmv/intern/tracksN.h
+++ b/extern/libmv/intern/tracksN.h
@@ -86,7 +86,7 @@ typedef struct libmv_Marker {
#ifdef __cplusplus
namespace mv {
- class Marker;
+ struct Marker;
}
void libmv_apiMarkerToMarker(const libmv_Marker& libmv_marker,
mv::Marker *marker);
diff --git a/extern/libmv/libmv/autotrack/autotrack.h
b/extern/libmv/libmv/autotrack/autotrack.h
index 7f8dbb9..1d7422f 100644
--- a/extern/libmv/libmv/autotrack/autotrack.h
+++ b/extern/libmv/libmv/autotrack/autotrack.h
@@ -37,7 +37,7 @@ using libmv::CameraIntrinsics;
using libmv::TrackRegionOptions;
using libmv::TrackRegionResult;
-class FrameAccessor;
+struct FrameAccessor;
class OperationListener;
// The coordinator of all tracking operations; keeps track of all state
diff --git a/extern/libmv/libmv/autotrack/predict_tracks.h
b/extern/libmv/libmv/autotrack/predict_tracks.h
index 9ff13ad..0a176d0 100644
--- a/extern/libmv/libmv/autotrack/predict_tracks.h
+++ b/extern/libmv/libmv/autotrack/predict_tracks.h
@@ -26,7 +26,7 @@
namespace mv {
class Tracks;
-class Marker;
+struct Marker;
// Predict the position of the given marker, and update it accordingly. The
// existing position will be overwritten.
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
