[Bf-blender-cvs] [293fa8e] libmv_prediction: Libmv: Use proper termination criteria based on the region tracker result

[Sergey Sharybin]

Commit: 293fa8eaffa94fbc544e0ec710aae31efde95f56
Author: Sergey Sharybin
Date:   Tue Oct 21 00:18:04 2014 +0600
Branches: libmv_prediction
https://developer.blender.org/rB293fa8eaffa94fbc544e0ec710aae31efde95f56

Libmv: Use proper termination criteria based on the region tracker result

===================================================================

M	extern/libmv/intern/autotrack.cc

===================================================================

diff --git a/extern/libmv/intern/autotrack.cc b/extern/libmv/intern/autotrack.cc
index 6ddb1af..f0cbc68 100644
--- a/extern/libmv/intern/autotrack.cc
+++ b/extern/libmv/intern/autotrack.cc
@@ -67,21 +67,12 @@ int libmv_autoTrackMarker(libmv_AutoTrack* libmv_autotrack,
   libmv_apiMarkerToMarker(*libmv_tracked_marker, &tracked_marker);
   libmv_configureTrackRegionOptions(*libmv_options,
                                     &options);
-
-  bool tracking_result
-    = ((AutoTrack*) libmv_autotrack)->TrackMarker(&tracked_marker,
-                                                  &result,
-                                                  &options);
+  (((AutoTrack*) libmv_autotrack)->TrackMarker(&tracked_marker,
+                                               &result,
+                                               &options));
   libmv_markerToApiMarker(tracked_marker, libmv_tracked_marker);
   libmv_regionTrackergetResult(result, libmv_result);
-
-  // TODO(keir): Update the termination string with failure details.
-  if (result.termination == TrackRegionResult::CONVERGENCE ||
-      result.termination == TrackRegionResult::NO_CONVERGENCE) {
-    tracking_result = true;
-  }
-
-  return tracking_result;
+  return result.is_usable();
 }
 
 void libmv_autoTrackAddMarker(libmv_AutoTrack* libmv_autotrack,