Rework detector API and implement Harris detector

Switch the detector API to a single function which accepts
a float image and detector options. This makes usage of
feature detection more unified across different algorithms.

Options structure is pretty much straightforward and contains
detector to be used and all the detector-specific settings.

Also implemented Harris feature detection algorithm which
is not as fast as FAST one but is expected to detect more
robust feature points. It is also likely that less features
are detected, but better quality than quantity.

Blender will now use Harris detector by default, later we'll
remove FAST detector.

1 files changed, 6 insertions, 5 deletions

diff --git a/extern/libmv/libmv-capi_stub.cc b/extern/libmv/libmv-capi_stub.cc
index bda9605b422..bd5d16c9077 100644
--- a/extern/libmv/libmv-capi_stub.cc
+++ b/extern/libmv/libmv-capi_stub.cc
@@ -146,15 +146,16 @@ void libmv_reconstructionDestroy(struct libmv_Reconstruction * /*libmv_reconstru
 
 /* ************ feature detector ************ */
 
-struct libmv_Features *libmv_detectFeaturesFAST(const unsigned char * /*data*/, int /*width*/, int /*height*/,
-                                                int /*stride*/, int /*margin*/, int /*min_trackness*/,
-                                                int /*min_distance*/)
+struct libmv_Features *libmv_detectFeaturesByte(const unsigned char */*image_buffer*/,
+                                                int /*width*/, int /*height*/, int /*channels*/,
+                                                libmv_DetectOptions */*options*/)
 {
 	return NULL;
 }
 
-struct libmv_Features *libmv_detectFeaturesMORAVEC(const unsigned char * /*data*/, int /*width*/, int /*height*/,
-                                                   int /*stride*/, int /*margin*/, int /*count*/, int /*min_distance*/)
+struct libmv_Features *libmv_detectFeaturesFloat(const float */*image_buffer*/,
+                                                 int /*width*/, int /*height*/, int /*channels*/,
+                                                 libmv_DetectOptions */*options*/)
 {
 	return NULL;
 }