feature-match: rename CVFMConfig to FMConfig

4 files changed, 13 insertions, 13 deletions

diff --git a/modules/ocl/cl_image_360_stitch.cpp b/modules/ocl/cl_image_360_stitch.cpp
index b90c2cb..d30ec33 100644
--- a/modules/ocl/cl_image_360_stitch.cpp
+++ b/modules/ocl/cl_image_360_stitch.cpp
@@ -112,10 +112,10 @@ CLBlenderGlobalScaleKernel::get_output_info (
 }
 
 #if HAVE_OPENCV
-static CVFMConfig
+static FMConfig
 get_fm_sphere_config (StitchResMode res_mode)
 {
-    CVFMConfig config;
+    FMConfig config;
 
     switch (res_mode) {
     case StitchRes1080P: {
@@ -162,10 +162,10 @@ get_fm_sphere_config (StitchResMode res_mode)
     return config;
 }
 
-static CVFMConfig
+static FMConfig
 get_fm_bowl_config ()
 {
-    CVFMConfig config;
+    FMConfig config;
     config.sitch_min_width = 136;
     config.min_corners = 4;
     config.offset_factor = 0.95f;
@@ -725,7 +725,7 @@ CLImage360Stitch::init_feature_match ()
 {
 #if HAVE_OPENCV
     bool is_sphere = (_surround_mode == SphereView);
-    CVFMConfig config = is_sphere ? get_fm_sphere_config (_res_mode) : get_fm_bowl_config ();
+    FMConfig config = is_sphere ? get_fm_sphere_config (_res_mode) : get_fm_bowl_config ();
 
     for (int i = 0; i < _fisheye_num; i++) {
         _feature_match[i] = is_sphere ? new CVFeatureMatch () : new CVFeatureMatchCluster ();
diff --git a/modules/soft/soft_stitcher.cpp b/modules/soft/soft_stitcher.cpp
index 61e25ee..74918c2 100644
--- a/modules/soft/soft_stitcher.cpp
+++ b/modules/soft/soft_stitcher.cpp
@@ -400,7 +400,7 @@ StitcherImpl::init_config (uint32_t count)
 #if ENABLE_FEATURE_MATCH
         _overlaps[i].matcher = new CVCapiFeatureMatch;
 
-        CVFMConfig config;
+        FMConfig config;
         config.sitch_min_width = 136;
         config.min_corners = 4;
         config.offset_factor = 0.8f;
diff --git a/xcore/interface/feature_match.cpp b/xcore/interface/feature_match.cpp
index cb2bb6e..78b4fd3 100644
--- a/xcore/interface/feature_match.cpp
+++ b/xcore/interface/feature_match.cpp
@@ -37,12 +37,12 @@ FeatureMatch::FeatureMatch ()
 }
 
 void
-FeatureMatch::set_config (CVFMConfig &config)
+FeatureMatch::set_config (FMConfig &config)
 {
     _config = config;
 }
 
-CVFMConfig
+FMConfig
 FeatureMatch::get_config ()
 {
     return _config;
diff --git a/xcore/interface/feature_match.h b/xcore/interface/feature_match.h
index 4f044ac..51465b2 100644
--- a/xcore/interface/feature_match.h
+++ b/xcore/interface/feature_match.h
@@ -28,7 +28,7 @@
 
 namespace XCam {
 
-struct CVFMConfig {
+struct FMConfig {
     int sitch_min_width;
     int min_corners;           // number of minimum efficient corners
     float offset_factor;       // last_offset * offset_factor + cur_offset * (1.0f - offset_factor)
@@ -38,7 +38,7 @@ struct CVFMConfig {
     float max_valid_offset_y;  // valid maximum offset in vertical direction
     float max_track_error;     // maximum track error
 
-    CVFMConfig ()
+    FMConfig ()
         : sitch_min_width (56)
         , min_corners (8)
         , offset_factor (0.8f)
@@ -56,8 +56,8 @@ public:
     explicit FeatureMatch ();
     virtual ~FeatureMatch () {};
 
-    void set_config (CVFMConfig &config);
-    CVFMConfig get_config ();
+    void set_config (FMConfig &config);
+    FMConfig get_config ();
 
     void set_fm_index (int idx);
 
@@ -87,7 +87,7 @@ protected:
     float                _mean_offset;
     float                _mean_offset_y;
     int                  _valid_count;
-    CVFMConfig           _config;
+    FMConfig             _config;
 
     // debug parameters
     int                  _fm_idx;