1 files changed, 18 insertions, 21 deletions

diff --git a/intern/libmv/intern/tracksN.cc b/intern/libmv/intern/tracksN.cc
index 1441d8a2066..c7ffb13a386 100644
--- a/intern/libmv/intern/tracksN.cc
+++ b/intern/libmv/intern/tracksN.cc
@@ -25,8 +25,7 @@
 using mv::Marker;
 using mv::Tracks;
 
-void libmv_apiMarkerToMarker(const libmv_Marker& libmv_marker,
-                             Marker *marker) {
+void libmv_apiMarkerToMarker(const libmv_Marker& libmv_marker, Marker* marker) {
   marker->clip = libmv_marker.clip;
   marker->frame = libmv_marker.frame;
   marker->track = libmv_marker.track;
@@ -41,17 +40,16 @@ void libmv_apiMarkerToMarker(const libmv_Marker& libmv_marker,
   marker->search_region.max(0) = libmv_marker.search_region_max[0];
   marker->search_region.max(1) = libmv_marker.search_region_max[1];
   marker->weight = libmv_marker.weight;
-  marker->source = (Marker::Source) libmv_marker.source;
-  marker->status = (Marker::Status) libmv_marker.status;
+  marker->source = (Marker::Source)libmv_marker.source;
+  marker->status = (Marker::Status)libmv_marker.status;
   marker->reference_clip = libmv_marker.reference_clip;
   marker->reference_frame = libmv_marker.reference_frame;
-  marker->model_type = (Marker::ModelType) libmv_marker.model_type;
+  marker->model_type = (Marker::ModelType)libmv_marker.model_type;
   marker->model_id = libmv_marker.model_id;
   marker->disabled_channels = libmv_marker.disabled_channels;
 }
 
-void libmv_markerToApiMarker(const Marker& marker,
-                             libmv_Marker *libmv_marker) {
+void libmv_markerToApiMarker(const Marker& marker, libmv_Marker* libmv_marker) {
   libmv_marker->clip = marker.clip;
   libmv_marker->frame = marker.frame;
   libmv_marker->track = marker.track;
@@ -66,11 +64,11 @@ void libmv_markerToApiMarker(const Marker& marker,
   libmv_marker->search_region_max[0] = marker.search_region.max(0);
   libmv_marker->search_region_max[1] = marker.search_region.max(1);
   libmv_marker->weight = marker.weight;
-  libmv_marker->source = (libmv_MarkerSource) marker.source;
-  libmv_marker->status = (libmv_MarkerStatus) marker.status;
+  libmv_marker->source = (libmv_MarkerSource)marker.source;
+  libmv_marker->status = (libmv_MarkerStatus)marker.status;
   libmv_marker->reference_clip = marker.reference_clip;
   libmv_marker->reference_frame = marker.reference_frame;
-  libmv_marker->model_type = (libmv_MarkerModelType) marker.model_type;
+  libmv_marker->model_type = (libmv_MarkerModelType)marker.model_type;
   libmv_marker->model_id = marker.model_id;
   libmv_marker->disabled_channels = marker.disabled_channels;
 }
@@ -78,7 +76,7 @@ void libmv_markerToApiMarker(const Marker& marker,
 libmv_TracksN* libmv_tracksNewN(void) {
   Tracks* tracks = LIBMV_OBJECT_NEW(Tracks);
 
-  return (libmv_TracksN*) tracks;
+  return (libmv_TracksN*)tracks;
 }
 
 void libmv_tracksDestroyN(libmv_TracksN* libmv_tracks) {
@@ -89,7 +87,7 @@ void libmv_tracksAddMarkerN(libmv_TracksN* libmv_tracks,
                             const libmv_Marker* libmv_marker) {
   Marker marker;
   libmv_apiMarkerToMarker(*libmv_marker, &marker);
-  ((Tracks*) libmv_tracks)->AddMarker(marker);
+  ((Tracks*)libmv_tracks)->AddMarker(marker);
 }
 
 void libmv_tracksGetMarkerN(libmv_TracksN* libmv_tracks,
@@ -98,7 +96,7 @@ void libmv_tracksGetMarkerN(libmv_TracksN* libmv_tracks,
                             int track,
                             libmv_Marker* libmv_marker) {
   Marker marker;
-  ((Tracks*) libmv_tracks)->GetMarker(clip, frame, track, &marker);
+  ((Tracks*)libmv_tracks)->GetMarker(clip, frame, track, &marker);
   libmv_markerToApiMarker(marker, libmv_marker);
 }
 
@@ -106,26 +104,25 @@ void libmv_tracksRemoveMarkerN(libmv_TracksN* libmv_tracks,
                                int clip,
                                int frame,
                                int track) {
-  ((Tracks *) libmv_tracks)->RemoveMarker(clip, frame, track);
+  ((Tracks*)libmv_tracks)->RemoveMarker(clip, frame, track);
 }
 
-void libmv_tracksRemoveMarkersForTrack(libmv_TracksN* libmv_tracks,
-                                       int track) {
-  ((Tracks *) libmv_tracks)->RemoveMarkersForTrack(track);
+void libmv_tracksRemoveMarkersForTrack(libmv_TracksN* libmv_tracks, int track) {
+  ((Tracks*)libmv_tracks)->RemoveMarkersForTrack(track);
 }
 
 int libmv_tracksMaxClipN(libmv_TracksN* libmv_tracks) {
-  return ((Tracks*) libmv_tracks)->MaxClip();
+  return ((Tracks*)libmv_tracks)->MaxClip();
 }
 
 int libmv_tracksMaxFrameN(libmv_TracksN* libmv_tracks, int clip) {
-  return ((Tracks*) libmv_tracks)->MaxFrame(clip);
+  return ((Tracks*)libmv_tracks)->MaxFrame(clip);
 }
 
 int libmv_tracksMaxTrackN(libmv_TracksN* libmv_tracks) {
-  return ((Tracks*) libmv_tracks)->MaxTrack();
+  return ((Tracks*)libmv_tracks)->MaxTrack();
 }
 
 int libmv_tracksNumMarkersN(libmv_TracksN* libmv_tracks) {
-  return ((Tracks*) libmv_tracks)->NumMarkers();
+  return ((Tracks*)libmv_tracks)->NumMarkers();
 }