opencv · asmorkalov · Nov 12, 2024 · Nov 2, 2024 · Nov 5, 2024 · Nov 7, 2024
diff --git a/modules/ccalib/CMakeLists.txt b/modules/ccalib/CMakeLists.txt
@@ -1,2 +1,2 @@
 set(the_description "Custom Calibration Pattern")
-ocv_define_module(ccalib opencv_core opencv_imgproc opencv_3d opencv_calib opencv_features2d opencv_xfeatures2d opencv_highgui opencv_imgcodecs WRAP python)
+ocv_define_module(ccalib opencv_core opencv_imgproc opencv_3d opencv_calib opencv_features opencv_xfeatures2d opencv_highgui opencv_imgcodecs WRAP python)
diff --git a/modules/ccalib/include/opencv2/ccalib.hpp b/modules/ccalib/include/opencv2/ccalib.hpp
@@ -43,7 +43,7 @@
 #define __OPENCV_CCALIB_HPP__
 
 #include <opencv2/core.hpp>
-#include <opencv2/features2d.hpp>
+#include <opencv2/features.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/3d.hpp>
 

diff --git a/modules/ccalib/include/opencv2/ccalib/randpattern.hpp b/modules/ccalib/include/opencv2/ccalib/randpattern.hpp
@@ -42,7 +42,7 @@
 #ifndef __OPENCV_RANDOMPATTERN_HPP__
 #define __OPENCV_RANDOMPATTERN_HPP__
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 #include "opencv2/xfeatures2d.hpp"
 #include "opencv2/highgui.hpp"
 

diff --git a/modules/ccalib/src/ccalib.cpp b/modules/ccalib/src/ccalib.cpp
@@ -50,7 +50,7 @@
 #include <opencv2/imgproc.hpp>
 #include <opencv2/3d.hpp>
 #include <opencv2/calib.hpp>
-#include <opencv2/features2d.hpp>
+#include <opencv2/features.hpp>
 
 #include <vector>
 #include <cstring>

diff --git a/modules/ccalib/src/precomp.hpp b/modules/ccalib/src/precomp.hpp
@@ -46,7 +46,7 @@
 #include <opencv2/core.hpp>
 #include <opencv2/3d.hpp>
 #include <opencv2/calib.hpp>
-#include <opencv2/features2d.hpp>
+#include <opencv2/features.hpp>
 #include "opencv2/xfeatures2d.hpp"
 #include "opencv2/imgcodecs.hpp"
 #include "opencv2/imgproc.hpp"

diff --git a/modules/cnn_3dobj/CMakeLists.txt b/modules/cnn_3dobj/CMakeLists.txt
@@ -39,7 +39,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 include_directories(${Caffe_INCLUDE_DIR})
 set(the_description "CNN for 3D object recognition and pose estimation including a completed Sphere View on 3D objects")
-ocv_define_module(cnn_3dobj opencv_core opencv_imgproc ${Caffe_LIBS} ${Glog_LIBS} ${Protobuf_LIBS} OPTIONAL opencv_features2d opencv_viz opencv_3d WRAP python)
+ocv_define_module(cnn_3dobj opencv_core opencv_imgproc ${Caffe_LIBS} ${Glog_LIBS} ${Protobuf_LIBS} OPTIONAL opencv_features opencv_viz opencv_3d WRAP python)
 ocv_add_testdata(testdata/cv contrib/cnn_3dobj)
 
 if(TARGET opencv_test_cnn_3dobj)

diff --git a/modules/cnn_3dobj/samples/classify.cpp b/modules/cnn_3dobj/samples/classify.cpp
@@ -38,7 +38,7 @@
  * @author Yida Wang
  */
 #include <opencv2/cnn_3dobj.hpp>
-#include <opencv2/features2d.hpp>
+#include <opencv2/features.hpp>
 #include <iomanip>
 using namespace cv;
 using namespace std;

diff --git a/modules/cnn_3dobj/samples/video.cpp b/modules/cnn_3dobj/samples/video.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <fstream>
 #include <opencv2/cnn_3dobj.hpp>
-#include <opencv2/features2d.hpp>
+#include <opencv2/features.hpp>
 #include <iomanip>
 using namespace cv;
 using namespace std;

diff --git a/modules/cudafeatures2d/CMakeLists.txt b/modules/cudafeatures2d/CMakeLists.txt
@@ -8,4 +8,4 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4100 /wd4324 /wd4512 /wd4515 -Wu
 if(ENABLE_CUDA_FIRST_CLASS_LANGUAGE)
   ocv_module_include_directories(${CUDAToolkit_INCLUDE_DIRS})
 endif()
-ocv_define_module(cudafeatures2d opencv_features2d opencv_cudafilters opencv_cudawarping WRAP python)
+ocv_define_module(cudafeatures2d opencv_features opencv_cudafilters opencv_cudawarping WRAP python)
diff --git a/modules/cudafeatures2d/include/opencv2/cudafeatures2d.hpp b/modules/cudafeatures2d/include/opencv2/cudafeatures2d.hpp
@@ -48,7 +48,7 @@
 #endif
 
 #include "opencv2/core/cuda.hpp"
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 #include "opencv2/cudafilters.hpp"
 
 /**

diff --git a/modules/cudafeatures2d/perf/perf_precomp.hpp b/modules/cudafeatures2d/perf/perf_precomp.hpp
@@ -46,7 +46,7 @@
 #include "opencv2/ts/cuda_perf.hpp"
 
 #include "opencv2/cudafeatures2d.hpp"
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 namespace opencv_test {
 using namespace perf;

diff --git a/modules/cudafeatures2d/src/precomp.hpp b/modules/cudafeatures2d/src/precomp.hpp
@@ -50,7 +50,7 @@
 #include "opencv2/cudafeatures2d.hpp"
 #include "opencv2/cudaarithm.hpp"
 #include "opencv2/cudawarping.hpp"
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "opencv2/core/private.cuda.hpp"
 

diff --git a/modules/cudafeatures2d/test/test_precomp.hpp b/modules/cudafeatures2d/test/test_precomp.hpp
@@ -46,7 +46,7 @@
 #include "opencv2/ts/cuda_test.hpp"
 
 #include "opencv2/cudafeatures2d.hpp"
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "cvconfig.h"
 

diff --git a/modules/cvv/CMakeLists.txt b/modules/cvv/CMakeLists.txt
@@ -4,7 +4,7 @@ if(NOT HAVE_QT OR NOT HAVE_CXX11 OR QT_VERSION_MAJOR LESS 5)
 endif()
 
 set(the_description "Debug visualization framework")
-ocv_add_module(cvv opencv_core opencv_imgproc opencv_features2d WRAP python)
+ocv_add_module(cvv opencv_core opencv_imgproc opencv_features WRAP python)
 ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wmissing-declarations)
 
 # Qt

diff --git a/modules/cvv/include/opencv2/cvv/dmatch.hpp b/modules/cvv/include/opencv2/cvv/dmatch.hpp
@@ -4,7 +4,7 @@
 #include <string>
 
 #include "opencv2/core.hpp"
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "call_meta_data.hpp"
 #include "debug_mode.hpp"

diff --git a/modules/cvv/samples/cvv_demo.cpp b/modules/cvv/samples/cvv_demo.cpp
@@ -3,7 +3,7 @@
 
 // library includes
 #include <opencv2/imgproc.hpp>
-#include <opencv2/features2d.hpp>
+#include <opencv2/features.hpp>
 #include <opencv2/videoio.hpp>
 
 #define CVVISUAL_DEBUGMODE

diff --git a/modules/cvv/src/gui/rawview_group_subtable.cpp b/modules/cvv/src/gui/rawview_group_subtable.cpp
@@ -4,7 +4,7 @@
 #include <algorithm>
 
 #include <opencv2/core.hpp>
-#include <opencv2/features2d.hpp>
+#include <opencv2/features.hpp>
 
 #include <QVBoxLayout>
 #include <QStringList>

diff --git a/modules/cvv/src/gui/rawview_table_row.hpp b/modules/cvv/src/gui/rawview_table_row.hpp
@@ -5,7 +5,7 @@
 #include <utility>
 
 #include <opencv2/core.hpp>
-#include <opencv2/features2d.hpp>
+#include <opencv2/features.hpp>
 
 #include <QTableWidget>
 #include <QString>

diff --git a/modules/cvv/src/impl/call.hpp b/modules/cvv/src/impl/call.hpp
@@ -6,7 +6,7 @@
 #include <QString>
 
 #include "opencv2/core.hpp"
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "opencv2/cvv/call_meta_data.hpp"
 

diff --git a/modules/cvv/src/impl/match_call.hpp b/modules/cvv/src/impl/match_call.hpp
@@ -6,7 +6,7 @@
 #include <type_traits>
 
 #include "opencv2/core.hpp"
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "call.hpp"
 

diff --git a/modules/cvv/src/qtutil/matchview/cvvkeypoint.hpp b/modules/cvv/src/qtutil/matchview/cvvkeypoint.hpp
@@ -10,7 +10,7 @@
 #include <QGraphicsScene>
 
 #include "opencv2/core.hpp"
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "keypointsettings.hpp"
 #include "../zoomableimage.hpp"

diff --git a/modules/cvv/src/qtutil/matchview/cvvmatch.hpp b/modules/cvv/src/qtutil/matchview/cvvmatch.hpp
@@ -10,7 +10,7 @@
 
 
 #include "opencv2/core.hpp"
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "matchsettings.hpp"
 #include "cvvkeypoint.hpp"

diff --git a/modules/cvv/src/qtutil/matchview/falsecolorkeypointpen.hpp b/modules/cvv/src/qtutil/matchview/falsecolorkeypointpen.hpp
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "keypointvaluechooser.hpp"
 #include "keypointsettings.hpp"

diff --git a/modules/cvv/src/qtutil/matchview/falsecolormatchpen.hpp b/modules/cvv/src/qtutil/matchview/falsecolormatchpen.hpp
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "matchsettings.hpp"
 

diff --git a/modules/cvv/src/qtutil/matchview/keypointintervallselection.hpp b/modules/cvv/src/qtutil/matchview/keypointintervallselection.hpp
@@ -1,7 +1,7 @@
 #ifndef CVVISUAL_KEY_POINT_INTERVALL_SELECTOR
 #define CVVISUAL_KEY_POINT_INTERVALL_SELECTOR
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "keypointselection.hpp"
 #include "keypointvaluechooser.hpp"

diff --git a/modules/cvv/src/qtutil/matchview/keypointmanagement.hpp b/modules/cvv/src/qtutil/matchview/keypointmanagement.hpp
@@ -5,7 +5,7 @@
 
 #include "../../util/util.hpp"
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "keypointselectionselector.hpp"
 #include "keypointsettingsselector.hpp"

diff --git a/modules/cvv/src/qtutil/matchview/keypointportionselector.hpp b/modules/cvv/src/qtutil/matchview/keypointportionselector.hpp
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "keypointselection.hpp"
 #include "keypointvaluechooser.hpp"

diff --git a/modules/cvv/src/qtutil/matchview/keypointselection.hpp b/modules/cvv/src/qtutil/matchview/keypointselection.hpp
@@ -3,7 +3,7 @@
 
 #include <QFrame>
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 namespace cvv{ namespace qtutil{
 

diff --git a/modules/cvv/src/qtutil/matchview/keypointselectionselector.hpp b/modules/cvv/src/qtutil/matchview/keypointselectionselector.hpp
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "keypointselection.hpp"
 #include "../registerhelper.hpp"

diff --git a/modules/cvv/src/qtutil/matchview/keypointsettingsselector.hpp b/modules/cvv/src/qtutil/matchview/keypointsettingsselector.hpp
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "keypointsettings.hpp"
 #include "../registerhelper.hpp"

diff --git a/modules/cvv/src/qtutil/matchview/keypointshowsetting.hpp b/modules/cvv/src/qtutil/matchview/keypointshowsetting.hpp
@@ -5,7 +5,7 @@
 
 #include <QPushButton>
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 #include "keypointsettings.hpp"
 
 namespace cvv{ namespace qtutil{

diff --git a/modules/cvv/src/qtutil/matchview/keypointvaluechooser.hpp b/modules/cvv/src/qtutil/matchview/keypointvaluechooser.hpp
@@ -4,7 +4,7 @@
 #include <QWidget>
 #include <QComboBox>
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 
 namespace cvv{ namespace qtutil{

diff --git a/modules/cvv/src/qtutil/matchview/matchintervallselection.hpp b/modules/cvv/src/qtutil/matchview/matchintervallselection.hpp
@@ -1,7 +1,7 @@
 #ifndef CVVISUAL_MATCH_INTERVALL_SELECTOR
 #define CVVISUAL_MATCH_INTERVALL_SELECTOR
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "matchselection.hpp"
 #include "../intervallselector.hpp"

diff --git a/modules/cvv/src/qtutil/matchview/matchmanagement.hpp b/modules/cvv/src/qtutil/matchview/matchmanagement.hpp
@@ -3,7 +3,7 @@
 
 #include <QCheckBox>
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "matchselectionselector.hpp"
 #include "matchsettingsselector.hpp"

diff --git a/modules/cvv/src/qtutil/matchview/matchportionselector.hpp b/modules/cvv/src/qtutil/matchview/matchportionselector.hpp
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "matchselection.hpp"
 #include "../portionselector.hpp"

diff --git a/modules/cvv/src/qtutil/matchview/matchscene.hpp b/modules/cvv/src/qtutil/matchview/matchscene.hpp
@@ -9,7 +9,7 @@
 #include <QGraphicsProxyWidget>
 
 #include "opencv2/core.hpp"
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 #include "cvvmatch.hpp"
 #include "cvvkeypoint.hpp"
 #include "zoomableproxyobject.hpp"

diff --git a/modules/cvv/src/qtutil/matchview/matchselection.hpp b/modules/cvv/src/qtutil/matchview/matchselection.hpp
@@ -3,7 +3,7 @@
 
 #include <QFrame>
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 namespace cvv{ namespace qtutil{
 

diff --git a/modules/cvv/src/qtutil/matchview/matchselectionselector.hpp b/modules/cvv/src/qtutil/matchview/matchselectionselector.hpp
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "matchselection.hpp"
 #include "../registerhelper.hpp"

diff --git a/modules/cvv/src/qtutil/matchview/matchsettingsselector.hpp b/modules/cvv/src/qtutil/matchview/matchsettingsselector.hpp
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "matchsettings.hpp"
 #include "../registerhelper.hpp"

diff --git a/modules/cvv/src/qtutil/matchview/matchshowsetting.hpp b/modules/cvv/src/qtutil/matchview/matchshowsetting.hpp
@@ -5,7 +5,7 @@
 
 #include <QPushButton>
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 #include "matchsettings.hpp"
 #include "cvvmatch.hpp"
 

diff --git a/modules/cvv/src/qtutil/matchview/rawview_window.hpp b/modules/cvv/src/qtutil/matchview/rawview_window.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include <opencv2/core.hpp>
-#include <opencv2/features2d.hpp>
+#include <opencv2/features.hpp>
 
 #include <QMainWindow>
 #include <QString>

diff --git a/modules/cvv/src/qtutil/matchview/showinrawviewwidget.hpp b/modules/cvv/src/qtutil/matchview/showinrawviewwidget.hpp
@@ -3,7 +3,7 @@
 
 #include <QWidget>
 
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "matchmanagement.hpp"
 #include "keypointmanagement.hpp"

diff --git a/modules/cvv/src/qtutil/util.hpp b/modules/cvv/src/qtutil/util.hpp
@@ -11,7 +11,7 @@
 
 #include "opencv2/core.hpp"
 #include "opencv2/imgproc.hpp"
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 
 namespace cvv

diff --git a/modules/cvv/src/view/linematchview.hpp b/modules/cvv/src/view/linematchview.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "opencv2/core.hpp"
-#include "opencv2/features2d.hpp"
+#include "opencv2/features.hpp"
 
 #include "../qtutil/matchview/matchmanagement.hpp"
 #include "../qtutil/matchview/keypointmanagement.hpp"

diff --git a/modules/cvv/src/view/match_view.hpp b/modules/cvv/src/view/match_view.hpp
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include <opencv2/core.hpp>
-#include <opencv2/features2d.hpp>
+#include <opencv2/features.hpp>
 
 #include "../impl/match_call.hpp"