Skip to content

Commit 2f69f9e

Browse files
kaingwadekaingwade
authored
Merge pull request #3820 from kaingwade:rename_features2d
Rename features2d to features #3820 This PR renames the module _features2d_ to _features_. Main PR: opencv/opencv: [#26405](opencv/opencv#26405)
1 parent fe10e50 commit 2f69f9e

File tree

103 files changed

+134
-134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+134
-134
lines changed

‎modules/ccalib/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
set(the_description "Custom Calibration Pattern")
2-
ocv_define_module(ccalib opencv_core opencv_imgproc opencv_3d opencv_calib opencv_features2d opencv_xfeatures2d opencv_highgui opencv_imgcodecs WRAP python)
2+
ocv_define_module(ccalib opencv_core opencv_imgproc opencv_3d opencv_calib opencv_features opencv_xfeatures2d opencv_highgui opencv_imgcodecs WRAP python)

‎modules/ccalib/include/opencv2/ccalib.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#define __OPENCV_CCALIB_HPP__
4444

4545
#include <opencv2/core.hpp>
46-
#include <opencv2/features2d.hpp>
46+
#include <opencv2/features.hpp>
4747
#include <opencv2/imgproc.hpp>
4848
#include <opencv2/3d.hpp>
4949

‎modules/ccalib/include/opencv2/ccalib/randpattern.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#ifndef __OPENCV_RANDOMPATTERN_HPP__
4343
#define __OPENCV_RANDOMPATTERN_HPP__
4444

45-
#include "opencv2/features2d.hpp"
45+
#include "opencv2/features.hpp"
4646
#include "opencv2/xfeatures2d.hpp"
4747
#include "opencv2/highgui.hpp"
4848

‎modules/ccalib/src/ccalib.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
#include <opencv2/imgproc.hpp>
5151
#include <opencv2/3d.hpp>
5252
#include <opencv2/calib.hpp>
53-
#include <opencv2/features2d.hpp>
53+
#include <opencv2/features.hpp>
5454

5555
#include <vector>
5656
#include <cstring>

‎modules/ccalib/src/precomp.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#include <opencv2/core.hpp>
4747
#include <opencv2/3d.hpp>
4848
#include <opencv2/calib.hpp>
49-
#include <opencv2/features2d.hpp>
49+
#include <opencv2/features.hpp>
5050
#include "opencv2/xfeatures2d.hpp"
5151
#include "opencv2/imgcodecs.hpp"
5252
#include "opencv2/imgproc.hpp"

‎modules/cnn_3dobj/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
3939

4040
include_directories(${Caffe_INCLUDE_DIR})
4141
set(the_description "CNN for 3D object recognition and pose estimation including a completed Sphere View on 3D objects")
42-
ocv_define_module(cnn_3dobj opencv_core opencv_imgproc ${Caffe_LIBS} ${Glog_LIBS} ${Protobuf_LIBS} OPTIONAL opencv_features2d opencv_viz opencv_3d WRAP python)
42+
ocv_define_module(cnn_3dobj opencv_core opencv_imgproc ${Caffe_LIBS} ${Glog_LIBS} ${Protobuf_LIBS} OPTIONAL opencv_features opencv_viz opencv_3d WRAP python)
4343
ocv_add_testdata(testdata/cv contrib/cnn_3dobj)
4444

4545
if(TARGET opencv_test_cnn_3dobj)

‎modules/cnn_3dobj/samples/classify.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* @author Yida Wang
3939
*/
4040
#include <opencv2/cnn_3dobj.hpp>
41-
#include <opencv2/features2d.hpp>
41+
#include <opencv2/features.hpp>
4242
#include <iomanip>
4343
using namespace cv;
4444
using namespace std;

‎modules/cnn_3dobj/samples/video.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <iostream>
44
#include <fstream>
55
#include <opencv2/cnn_3dobj.hpp>
6-
#include <opencv2/features2d.hpp>
6+
#include <opencv2/features.hpp>
77
#include <iomanip>
88
using namespace cv;
99
using namespace std;

‎modules/cudafeatures2d/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4100 /wd4324 /wd4512 /wd4515 -Wu
88
if(ENABLE_CUDA_FIRST_CLASS_LANGUAGE)
99
ocv_module_include_directories(${CUDAToolkit_INCLUDE_DIRS})
1010
endif()
11-
ocv_define_module(cudafeatures2d opencv_features2d opencv_cudafilters opencv_cudawarping WRAP python)
11+
ocv_define_module(cudafeatures2d opencv_features opencv_cudafilters opencv_cudawarping WRAP python)

‎modules/cudafeatures2d/include/opencv2/cudafeatures2d.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#endif
4949

5050
#include "opencv2/core/cuda.hpp"
51-
#include "opencv2/features2d.hpp"
51+
#include "opencv2/features.hpp"
5252
#include "opencv2/cudafilters.hpp"
5353

5454
/**

‎modules/cudafeatures2d/perf/perf_precomp.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#include "opencv2/ts/cuda_perf.hpp"
4747

4848
#include "opencv2/cudafeatures2d.hpp"
49-
#include "opencv2/features2d.hpp"
49+
#include "opencv2/features.hpp"
5050

5151
namespace opencv_test {
5252
using namespace perf;

‎modules/cudafeatures2d/src/precomp.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
#include "opencv2/cudafeatures2d.hpp"
5151
#include "opencv2/cudaarithm.hpp"
5252
#include "opencv2/cudawarping.hpp"
53-
#include "opencv2/features2d.hpp"
53+
#include "opencv2/features.hpp"
5454

5555
#include "opencv2/core/private.cuda.hpp"
5656

‎modules/cudafeatures2d/test/test_precomp.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#include "opencv2/ts/cuda_test.hpp"
4747

4848
#include "opencv2/cudafeatures2d.hpp"
49-
#include "opencv2/features2d.hpp"
49+
#include "opencv2/features.hpp"
5050

5151
#include "cvconfig.h"
5252

‎modules/cvv/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if(NOT HAVE_QT OR NOT HAVE_CXX11 OR QT_VERSION_MAJOR LESS 5)
44
endif()
55

66
set(the_description "Debug visualization framework")
7-
ocv_add_module(cvv opencv_core opencv_imgproc opencv_features2d WRAP python)
7+
ocv_add_module(cvv opencv_core opencv_imgproc opencv_features WRAP python)
88
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wmissing-declarations)
99

1010
# Qt

‎modules/cvv/include/opencv2/cvv/dmatch.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <string>
55

66
#include "opencv2/core.hpp"
7-
#include "opencv2/features2d.hpp"
7+
#include "opencv2/features.hpp"
88

99
#include "call_meta_data.hpp"
1010
#include "debug_mode.hpp"

‎modules/cvv/samples/cvv_demo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// library includes
55
#include <opencv2/imgproc.hpp>
6-
#include <opencv2/features2d.hpp>
6+
#include <opencv2/features.hpp>
77
#include <opencv2/videoio.hpp>
88

99
#define CVVISUAL_DEBUGMODE

‎modules/cvv/src/gui/rawview_group_subtable.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <algorithm>
55

66
#include <opencv2/core.hpp>
7-
#include <opencv2/features2d.hpp>
7+
#include <opencv2/features.hpp>
88

99
#include <QVBoxLayout>
1010
#include <QStringList>

‎modules/cvv/src/gui/rawview_table_row.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <utility>
66

77
#include <opencv2/core.hpp>
8-
#include <opencv2/features2d.hpp>
8+
#include <opencv2/features.hpp>
99

1010
#include <QTableWidget>
1111
#include <QString>

‎modules/cvv/src/impl/call.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <QString>
77

88
#include "opencv2/core.hpp"
9-
#include "opencv2/features2d.hpp"
9+
#include "opencv2/features.hpp"
1010

1111
#include "opencv2/cvv/call_meta_data.hpp"
1212

‎modules/cvv/src/impl/match_call.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <type_traits>
77

88
#include "opencv2/core.hpp"
9-
#include "opencv2/features2d.hpp"
9+
#include "opencv2/features.hpp"
1010

1111
#include "call.hpp"
1212

‎modules/cvv/src/qtutil/matchview/cvvkeypoint.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <QGraphicsScene>
1111

1212
#include "opencv2/core.hpp"
13-
#include "opencv2/features2d.hpp"
13+
#include "opencv2/features.hpp"
1414

1515
#include "keypointsettings.hpp"
1616
#include "../zoomableimage.hpp"

‎modules/cvv/src/qtutil/matchview/cvvmatch.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111

1212
#include "opencv2/core.hpp"
13-
#include "opencv2/features2d.hpp"
13+
#include "opencv2/features.hpp"
1414

1515
#include "matchsettings.hpp"
1616
#include "cvvkeypoint.hpp"

‎modules/cvv/src/qtutil/matchview/falsecolorkeypointpen.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <vector>
55

6-
#include "opencv2/features2d.hpp"
6+
#include "opencv2/features.hpp"
77

88
#include "keypointvaluechooser.hpp"
99
#include "keypointsettings.hpp"

‎modules/cvv/src/qtutil/matchview/falsecolormatchpen.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <vector>
55

6-
#include "opencv2/features2d.hpp"
6+
#include "opencv2/features.hpp"
77

88
#include "matchsettings.hpp"
99

‎modules/cvv/src/qtutil/matchview/keypointintervallselection.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef CVVISUAL_KEY_POINT_INTERVALL_SELECTOR
22
#define CVVISUAL_KEY_POINT_INTERVALL_SELECTOR
33

4-
#include "opencv2/features2d.hpp"
4+
#include "opencv2/features.hpp"
55

66
#include "keypointselection.hpp"
77
#include "keypointvaluechooser.hpp"

‎modules/cvv/src/qtutil/matchview/keypointmanagement.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "../../util/util.hpp"
77

8-
#include "opencv2/features2d.hpp"
8+
#include "opencv2/features.hpp"
99

1010
#include "keypointselectionselector.hpp"
1111
#include "keypointsettingsselector.hpp"

‎modules/cvv/src/qtutil/matchview/keypointportionselector.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <vector>
55

6-
#include "opencv2/features2d.hpp"
6+
#include "opencv2/features.hpp"
77

88
#include "keypointselection.hpp"
99
#include "keypointvaluechooser.hpp"

‎modules/cvv/src/qtutil/matchview/keypointselection.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <QFrame>
55

6-
#include "opencv2/features2d.hpp"
6+
#include "opencv2/features.hpp"
77

88
namespace cvv{ namespace qtutil{
99

‎modules/cvv/src/qtutil/matchview/keypointselectionselector.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <vector>
55

6-
#include "opencv2/features2d.hpp"
6+
#include "opencv2/features.hpp"
77

88
#include "keypointselection.hpp"
99
#include "../registerhelper.hpp"

‎modules/cvv/src/qtutil/matchview/keypointsettingsselector.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <vector>
55

6-
#include "opencv2/features2d.hpp"
6+
#include "opencv2/features.hpp"
77

88
#include "keypointsettings.hpp"
99
#include "../registerhelper.hpp"

‎modules/cvv/src/qtutil/matchview/keypointshowsetting.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <QPushButton>
77

8-
#include "opencv2/features2d.hpp"
8+
#include "opencv2/features.hpp"
99
#include "keypointsettings.hpp"
1010

1111
namespace cvv{ namespace qtutil{

‎modules/cvv/src/qtutil/matchview/keypointvaluechooser.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <QWidget>
55
#include <QComboBox>
66

7-
#include "opencv2/features2d.hpp"
7+
#include "opencv2/features.hpp"
88

99

1010
namespace cvv{ namespace qtutil{

‎modules/cvv/src/qtutil/matchview/matchintervallselection.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef CVVISUAL_MATCH_INTERVALL_SELECTOR
22
#define CVVISUAL_MATCH_INTERVALL_SELECTOR
33

4-
#include "opencv2/features2d.hpp"
4+
#include "opencv2/features.hpp"
55

66
#include "matchselection.hpp"
77
#include "../intervallselector.hpp"

‎modules/cvv/src/qtutil/matchview/matchmanagement.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <QCheckBox>
55

6-
#include "opencv2/features2d.hpp"
6+
#include "opencv2/features.hpp"
77

88
#include "matchselectionselector.hpp"
99
#include "matchsettingsselector.hpp"

‎modules/cvv/src/qtutil/matchview/matchportionselector.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <vector>
55

6-
#include "opencv2/features2d.hpp"
6+
#include "opencv2/features.hpp"
77

88
#include "matchselection.hpp"
99
#include "../portionselector.hpp"

‎modules/cvv/src/qtutil/matchview/matchscene.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <QGraphicsProxyWidget>
1010

1111
#include "opencv2/core.hpp"
12-
#include "opencv2/features2d.hpp"
12+
#include "opencv2/features.hpp"
1313
#include "cvvmatch.hpp"
1414
#include "cvvkeypoint.hpp"
1515
#include "zoomableproxyobject.hpp"

‎modules/cvv/src/qtutil/matchview/matchselection.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <QFrame>
55

6-
#include "opencv2/features2d.hpp"
6+
#include "opencv2/features.hpp"
77

88
namespace cvv{ namespace qtutil{
99

‎modules/cvv/src/qtutil/matchview/matchselectionselector.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <vector>
55

6-
#include "opencv2/features2d.hpp"
6+
#include "opencv2/features.hpp"
77

88
#include "matchselection.hpp"
99
#include "../registerhelper.hpp"

‎modules/cvv/src/qtutil/matchview/matchsettingsselector.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <vector>
55

6-
#include "opencv2/features2d.hpp"
6+
#include "opencv2/features.hpp"
77

88
#include "matchsettings.hpp"
99
#include "../registerhelper.hpp"

‎modules/cvv/src/qtutil/matchview/matchshowsetting.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <QPushButton>
77

8-
#include "opencv2/features2d.hpp"
8+
#include "opencv2/features.hpp"
99
#include "matchsettings.hpp"
1010
#include "cvvmatch.hpp"
1111

‎modules/cvv/src/qtutil/matchview/rawview_window.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <vector>
55

66
#include <opencv2/core.hpp>
7-
#include <opencv2/features2d.hpp>
7+
#include <opencv2/features.hpp>
88

99
#include <QMainWindow>
1010
#include <QString>

‎modules/cvv/src/qtutil/matchview/showinrawviewwidget.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <QWidget>
55

6-
#include "opencv2/features2d.hpp"
6+
#include "opencv2/features.hpp"
77

88
#include "matchmanagement.hpp"
99
#include "keypointmanagement.hpp"

‎modules/cvv/src/qtutil/util.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "opencv2/core.hpp"
1313
#include "opencv2/imgproc.hpp"
14-
#include "opencv2/features2d.hpp"
14+
#include "opencv2/features.hpp"
1515

1616

1717
namespace cvv

‎modules/cvv/src/view/linematchview.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <vector>
55

66
#include "opencv2/core.hpp"
7-
#include "opencv2/features2d.hpp"
7+
#include "opencv2/features.hpp"
88

99
#include "../qtutil/matchview/matchmanagement.hpp"
1010
#include "../qtutil/matchview/keypointmanagement.hpp"

‎modules/cvv/src/view/match_view.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <vector>
77

88
#include <opencv2/core.hpp>
9-
#include <opencv2/features2d.hpp>
9+
#include <opencv2/features.hpp>
1010

1111
#include "../impl/match_call.hpp"
1212

0 commit comments

Comments
 (0)