From 488b48e04b363a3cbc0409fc2d296ade2a3f5b1f Mon Sep 17 00:00:00 2001 From: kaingwade Date: Sat, 2 Nov 2024 23:30:25 +0800 Subject: [PATCH 1/4] Rename features2d --- modules/ccalib/CMakeLists.txt | 2 +- modules/ccalib/include/opencv2/ccalib.hpp | 2 +- modules/ccalib/include/opencv2/ccalib/randpattern.hpp | 2 +- modules/ccalib/src/ccalib.cpp | 2 +- modules/ccalib/src/precomp.hpp | 2 +- modules/cnn_3dobj/CMakeLists.txt | 2 +- modules/cnn_3dobj/samples/classify.cpp | 2 +- modules/cnn_3dobj/samples/video.cpp | 2 +- modules/cudafeatures2d/CMakeLists.txt | 2 +- modules/cudafeatures2d/include/opencv2/cudafeatures2d.hpp | 2 +- modules/cudafeatures2d/perf/perf_precomp.hpp | 2 +- modules/cudafeatures2d/src/precomp.hpp | 2 +- modules/cudafeatures2d/test/test_precomp.hpp | 2 +- modules/cvv/CMakeLists.txt | 2 +- modules/cvv/include/opencv2/cvv/dmatch.hpp | 2 +- modules/cvv/samples/cvv_demo.cpp | 2 +- modules/cvv/src/gui/rawview_group_subtable.cpp | 2 +- modules/cvv/src/gui/rawview_table_row.hpp | 2 +- modules/cvv/src/impl/call.hpp | 2 +- modules/cvv/src/impl/match_call.hpp | 2 +- modules/cvv/src/qtutil/matchview/cvvkeypoint.hpp | 2 +- modules/cvv/src/qtutil/matchview/cvvmatch.hpp | 2 +- .../cvv/src/qtutil/matchview/falsecolorkeypointpen.hpp | 2 +- modules/cvv/src/qtutil/matchview/falsecolormatchpen.hpp | 2 +- .../src/qtutil/matchview/keypointintervallselection.hpp | 2 +- modules/cvv/src/qtutil/matchview/keypointmanagement.hpp | 2 +- .../cvv/src/qtutil/matchview/keypointportionselector.hpp | 2 +- modules/cvv/src/qtutil/matchview/keypointselection.hpp | 2 +- .../src/qtutil/matchview/keypointselectionselector.hpp | 2 +- .../cvv/src/qtutil/matchview/keypointsettingsselector.hpp | 2 +- modules/cvv/src/qtutil/matchview/keypointshowsetting.hpp | 2 +- modules/cvv/src/qtutil/matchview/keypointvaluechooser.hpp | 2 +- .../cvv/src/qtutil/matchview/matchintervallselection.hpp | 2 +- modules/cvv/src/qtutil/matchview/matchmanagement.hpp | 2 +- modules/cvv/src/qtutil/matchview/matchportionselector.hpp | 2 +- modules/cvv/src/qtutil/matchview/matchscene.hpp | 2 +- modules/cvv/src/qtutil/matchview/matchselection.hpp | 2 +- .../cvv/src/qtutil/matchview/matchselectionselector.hpp | 2 +- .../cvv/src/qtutil/matchview/matchsettingsselector.hpp | 2 +- modules/cvv/src/qtutil/matchview/matchshowsetting.hpp | 2 +- modules/cvv/src/qtutil/matchview/rawview_window.hpp | 2 +- modules/cvv/src/qtutil/matchview/showinrawviewwidget.hpp | 2 +- modules/cvv/src/qtutil/util.hpp | 2 +- modules/cvv/src/view/linematchview.hpp | 2 +- modules/cvv/src/view/match_view.hpp | 2 +- modules/cvv/src/view/pointmatchview.hpp | 2 +- modules/cvv/src/view/rawview.hpp | 2 +- modules/cvv/src/view/translationsmatchview.hpp | 2 +- .../cvv/tutorials/visual_debugging_introduction.markdown | 4 ++-- modules/julia/CMakeLists.txt | 2 +- modules/julia/gen/binding_templates_cpp/cv_core.cpp | 6 +++--- modules/julia/gen/cpp_files/jlcv.hpp | 4 ++-- modules/line_descriptor/CMakeLists.txt | 2 +- .../include/opencv2/line_descriptor/descriptor.hpp | 4 ++-- modules/line_descriptor/samples/compute_descriptors.cpp | 8 ++++---- modules/line_descriptor/samples/knn_matching.cpp | 8 ++++---- modules/line_descriptor/samples/lines_extraction.cpp | 8 ++++---- modules/line_descriptor/samples/lsd_lines_extraction.cpp | 8 ++++---- modules/line_descriptor/samples/matching.cpp | 8 ++++---- modules/line_descriptor/samples/radius_matching.cpp | 8 ++++---- modules/matlab/CMakeLists.txt | 2 +- modules/saliency/CMakeLists.txt | 2 +- modules/sfm/CMakeLists.txt | 2 +- .../libmv_light/libmv/correspondence/feature_matching.cc | 2 +- .../sfm/src/libmv_light/libmv/correspondence/matches.h | 2 +- modules/text/CMakeLists.txt | 2 +- modules/text/samples/webcam_demo.cpp | 2 +- modules/videostab/CMakeLists.txt | 2 +- .../videostab/include/opencv2/videostab/global_motion.hpp | 2 +- modules/videostab/src/precomp.hpp | 2 +- modules/viz/CMakeLists.txt | 2 +- modules/xfeatures2d/CMakeLists.txt | 6 +++--- modules/xfeatures2d/include/opencv2/xfeatures2d.hpp | 2 +- .../xfeatures2d/include/opencv2/xfeatures2d/nonfree.hpp | 2 +- .../misc/java/test/AGASTFeatureDetectorTest.java | 2 +- .../misc/java/test/AKAZEDescriptorExtractorTest.java | 2 +- .../misc/java/test/BOWImgDescriptorExtractorTest.java | 6 +++--- .../misc/java/test/BRIEFDescriptorExtractorTest.java | 4 ++-- .../misc/java/test/BRISKDescriptorExtractorTest.java | 2 +- .../misc/java/test/DAISYDescriptorExtractorTest.java | 2 +- .../misc/java/test/FREAKDescriptorExtractorTest.java | 2 +- .../misc/java/test/HARRISFeatureDetectorTest.java | 2 +- .../misc/java/test/KAZEDescriptorExtractorTest.java | 2 +- .../misc/java/test/LATCHDescriptorExtractorTest.java | 2 +- .../misc/java/test/LUCIDDescriptorExtractorTest.java | 2 +- .../misc/java/test/MSDFeatureDetectorTest.java | 2 +- .../misc/java/test/STARFeatureDetectorTest.java | 2 +- .../misc/java/test/SURFDescriptorExtractorTest.java | 2 +- .../misc/java/test/SURFFeatureDetectorTest.java | 2 +- modules/xfeatures2d/samples/LATCH_match.cpp | 2 +- modules/xfeatures2d/samples/bagofwords_classification.cpp | 2 +- modules/xfeatures2d/samples/gms_matcher.cpp | 2 +- modules/xfeatures2d/samples/shape_transformation.cpp | 2 +- modules/xfeatures2d/samples/surf_matcher.cpp | 2 +- modules/xfeatures2d/samples/video_homography.cpp | 4 ++-- modules/xfeatures2d/src/kaze/KAZEConfig.h | 2 +- modules/xfeatures2d/test/test_features2d.cpp | 6 +++--- .../test/test_rotation_and_scale_invariance.cpp | 4 ++-- modules/xfeatures2d/test/test_surf.ocl.cpp | 2 +- modules/xobjdetect/CMakeLists.txt | 2 +- modules/xobjdetect/samples/dbt_face_detection.cpp | 2 +- modules/xobjdetect/tools/createsamples/CMakeLists.txt | 2 +- modules/xobjdetect/tools/traincascade/CMakeLists.txt | 2 +- modules/xstereo/CMakeLists.txt | 2 +- 104 files changed, 136 insertions(+), 136 deletions(-) diff --git a/modules/ccalib/CMakeLists.txt b/modules/ccalib/CMakeLists.txt index dd82c1936cb..39ea0fe797f 100644 --- 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 index dbd1c1fae43..b8053fd82be 100644 --- a/modules/ccalib/include/opencv2/ccalib.hpp +++ b/modules/ccalib/include/opencv2/ccalib.hpp @@ -43,7 +43,7 @@ #define __OPENCV_CCALIB_HPP__ #include -#include +#include #include #include diff --git a/modules/ccalib/include/opencv2/ccalib/randpattern.hpp b/modules/ccalib/include/opencv2/ccalib/randpattern.hpp index 41ffd095a0e..faf5b570b6b 100644 --- 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 index bb1c79fabd0..f043a3aac2c 100644 --- a/modules/ccalib/src/ccalib.cpp +++ b/modules/ccalib/src/ccalib.cpp @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include diff --git a/modules/ccalib/src/precomp.hpp b/modules/ccalib/src/precomp.hpp index 9ab4181926d..590a1f4ccd0 100644 --- a/modules/ccalib/src/precomp.hpp +++ b/modules/ccalib/src/precomp.hpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #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 index 083c09f3f6d..7ebb15a57e7 100644 --- 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 index 978b9af6343..7b4b5a80a65 100644 --- a/modules/cnn_3dobj/samples/classify.cpp +++ b/modules/cnn_3dobj/samples/classify.cpp @@ -38,7 +38,7 @@ * @author Yida Wang */ #include -#include +#include #include using namespace cv; using namespace std; diff --git a/modules/cnn_3dobj/samples/video.cpp b/modules/cnn_3dobj/samples/video.cpp index 8d9117200d9..655bff8aeb5 100644 --- a/modules/cnn_3dobj/samples/video.cpp +++ b/modules/cnn_3dobj/samples/video.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include using namespace cv; using namespace std; diff --git a/modules/cudafeatures2d/CMakeLists.txt b/modules/cudafeatures2d/CMakeLists.txt index 2b6023c0b66..9e21e041bf8 100644 --- 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 index 311b0dc28b8..3cb9452c8ff 100644 --- 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 index df801ba5368..4ccb37c5b90 100644 --- 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 index da64ba4a1c7..a8947738420 100644 --- 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 index 15283f30faf..31c6f479a68 100644 --- 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 index 645e7b39443..25adcc4c233 100644 --- 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 index d152cb43a65..8c19cfe28ee 100644 --- a/modules/cvv/include/opencv2/cvv/dmatch.hpp +++ b/modules/cvv/include/opencv2/cvv/dmatch.hpp @@ -4,7 +4,7 @@ #include #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 index 3ad3328c910..447db9eb041 100644 --- a/modules/cvv/samples/cvv_demo.cpp +++ b/modules/cvv/samples/cvv_demo.cpp @@ -3,7 +3,7 @@ // library includes #include -#include +#include #include #define CVVISUAL_DEBUGMODE diff --git a/modules/cvv/src/gui/rawview_group_subtable.cpp b/modules/cvv/src/gui/rawview_group_subtable.cpp index c6f6f6e366d..28bd7ea098d 100644 --- a/modules/cvv/src/gui/rawview_group_subtable.cpp +++ b/modules/cvv/src/gui/rawview_group_subtable.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/modules/cvv/src/gui/rawview_table_row.hpp b/modules/cvv/src/gui/rawview_table_row.hpp index 8a8ae17125b..5975921b56c 100644 --- a/modules/cvv/src/gui/rawview_table_row.hpp +++ b/modules/cvv/src/gui/rawview_table_row.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include diff --git a/modules/cvv/src/impl/call.hpp b/modules/cvv/src/impl/call.hpp index cde9f389485..da7451584a4 100644 --- a/modules/cvv/src/impl/call.hpp +++ b/modules/cvv/src/impl/call.hpp @@ -6,7 +6,7 @@ #include #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 index ee548510b06..88eeb897482 100644 --- a/modules/cvv/src/impl/match_call.hpp +++ b/modules/cvv/src/impl/match_call.hpp @@ -6,7 +6,7 @@ #include #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 index fcf26a57fbd..7d9250983fc 100644 --- a/modules/cvv/src/qtutil/matchview/cvvkeypoint.hpp +++ b/modules/cvv/src/qtutil/matchview/cvvkeypoint.hpp @@ -10,7 +10,7 @@ #include #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 index 455d5db0cab..9656653d38a 100644 --- 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 index 555730d2b2c..662dca503cf 100644 --- a/modules/cvv/src/qtutil/matchview/falsecolorkeypointpen.hpp +++ b/modules/cvv/src/qtutil/matchview/falsecolorkeypointpen.hpp @@ -3,7 +3,7 @@ #include -#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 index 259c5f09a72..328a3eb619c 100644 --- a/modules/cvv/src/qtutil/matchview/falsecolormatchpen.hpp +++ b/modules/cvv/src/qtutil/matchview/falsecolormatchpen.hpp @@ -3,7 +3,7 @@ #include -#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 index 7f88cc53202..2867933e985 100644 --- 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 index 4bc78b0e1ce..b97d2eab4a2 100644 --- 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 index ac03b648cad..35cf9478ce5 100644 --- a/modules/cvv/src/qtutil/matchview/keypointportionselector.hpp +++ b/modules/cvv/src/qtutil/matchview/keypointportionselector.hpp @@ -3,7 +3,7 @@ #include -#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 index 0d567dfd219..476c2d8b6bb 100644 --- a/modules/cvv/src/qtutil/matchview/keypointselection.hpp +++ b/modules/cvv/src/qtutil/matchview/keypointselection.hpp @@ -3,7 +3,7 @@ #include -#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 index e015961fbf3..3940dd17615 100644 --- a/modules/cvv/src/qtutil/matchview/keypointselectionselector.hpp +++ b/modules/cvv/src/qtutil/matchview/keypointselectionselector.hpp @@ -3,7 +3,7 @@ #include -#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 index 2a099bbe9c9..f70819b2862 100644 --- a/modules/cvv/src/qtutil/matchview/keypointsettingsselector.hpp +++ b/modules/cvv/src/qtutil/matchview/keypointsettingsselector.hpp @@ -3,7 +3,7 @@ #include -#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 index 46c984a0786..4d322f8fb7d 100644 --- a/modules/cvv/src/qtutil/matchview/keypointshowsetting.hpp +++ b/modules/cvv/src/qtutil/matchview/keypointshowsetting.hpp @@ -5,7 +5,7 @@ #include -#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 index 917bd022379..250f6ff3a36 100644 --- a/modules/cvv/src/qtutil/matchview/keypointvaluechooser.hpp +++ b/modules/cvv/src/qtutil/matchview/keypointvaluechooser.hpp @@ -4,7 +4,7 @@ #include #include -#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 index 53985b7931d..5e1318bdeb2 100644 --- 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 index cad9d903e26..a7420e313e4 100644 --- a/modules/cvv/src/qtutil/matchview/matchmanagement.hpp +++ b/modules/cvv/src/qtutil/matchview/matchmanagement.hpp @@ -3,7 +3,7 @@ #include -#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 index e860914f93b..888ecb84eda 100644 --- a/modules/cvv/src/qtutil/matchview/matchportionselector.hpp +++ b/modules/cvv/src/qtutil/matchview/matchportionselector.hpp @@ -3,7 +3,7 @@ #include -#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 index 38c02291fe9..836a4f48482 100644 --- a/modules/cvv/src/qtutil/matchview/matchscene.hpp +++ b/modules/cvv/src/qtutil/matchview/matchscene.hpp @@ -9,7 +9,7 @@ #include #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 index f5a85e55052..49a385e6880 100644 --- a/modules/cvv/src/qtutil/matchview/matchselection.hpp +++ b/modules/cvv/src/qtutil/matchview/matchselection.hpp @@ -3,7 +3,7 @@ #include -#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 index 898b0595cf7..ab0b2cab74e 100644 --- a/modules/cvv/src/qtutil/matchview/matchselectionselector.hpp +++ b/modules/cvv/src/qtutil/matchview/matchselectionselector.hpp @@ -3,7 +3,7 @@ #include -#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 index 0a527a93b10..39146a43253 100644 --- a/modules/cvv/src/qtutil/matchview/matchsettingsselector.hpp +++ b/modules/cvv/src/qtutil/matchview/matchsettingsselector.hpp @@ -3,7 +3,7 @@ #include -#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 index 4fd4c814ae1..0a97a4b236e 100644 --- a/modules/cvv/src/qtutil/matchview/matchshowsetting.hpp +++ b/modules/cvv/src/qtutil/matchview/matchshowsetting.hpp @@ -5,7 +5,7 @@ #include -#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 index 7198c2cdc40..609c1ffb4d7 100644 --- a/modules/cvv/src/qtutil/matchview/rawview_window.hpp +++ b/modules/cvv/src/qtutil/matchview/rawview_window.hpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/modules/cvv/src/qtutil/matchview/showinrawviewwidget.hpp b/modules/cvv/src/qtutil/matchview/showinrawviewwidget.hpp index 9c5854476fa..bad4c6adefb 100644 --- a/modules/cvv/src/qtutil/matchview/showinrawviewwidget.hpp +++ b/modules/cvv/src/qtutil/matchview/showinrawviewwidget.hpp @@ -3,7 +3,7 @@ #include -#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 index f3e4f7180ee..91b33f34d25 100644 --- 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 index d44653a2c27..659e0c1f69b 100644 --- a/modules/cvv/src/view/linematchview.hpp +++ b/modules/cvv/src/view/linematchview.hpp @@ -4,7 +4,7 @@ #include #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 index 074951d4451..2afe72fb223 100644 --- a/modules/cvv/src/view/match_view.hpp +++ b/modules/cvv/src/view/match_view.hpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include "../impl/match_call.hpp" diff --git a/modules/cvv/src/view/pointmatchview.hpp b/modules/cvv/src/view/pointmatchview.hpp index e6a749e6693..9928503d4e5 100644 --- a/modules/cvv/src/view/pointmatchview.hpp +++ b/modules/cvv/src/view/pointmatchview.hpp @@ -4,7 +4,7 @@ #include #include "opencv2/core.hpp" -#include "opencv2/features2d.hpp" +#include "opencv2/features.hpp" #include "../qtutil/matchview/matchmanagement.hpp" #include "match_view.hpp" diff --git a/modules/cvv/src/view/rawview.hpp b/modules/cvv/src/view/rawview.hpp index 8d491589a52..fb2845e6cd6 100644 --- a/modules/cvv/src/view/rawview.hpp +++ b/modules/cvv/src/view/rawview.hpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/modules/cvv/src/view/translationsmatchview.hpp b/modules/cvv/src/view/translationsmatchview.hpp index 822137630f7..ad8793c8e18 100644 --- a/modules/cvv/src/view/translationsmatchview.hpp +++ b/modules/cvv/src/view/translationsmatchview.hpp @@ -4,7 +4,7 @@ #include #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/tutorials/visual_debugging_introduction.markdown b/modules/cvv/tutorials/visual_debugging_introduction.markdown index d8e7000f0c2..869386e722f 100644 --- a/modules/cvv/tutorials/visual_debugging_introduction.markdown +++ b/modules/cvv/tutorials/visual_debugging_introduction.markdown @@ -24,7 +24,7 @@ The example code - captures images (*videoio*), e.g. from a webcam, - applies some filters to each image (*imgproc*), -- detects image features and matches them to the previous image (*features2d*). +- detects image features and matches them to the previous image (*features*). If the program is compiled without visual debugging (see CMakeLists.txt below) the only result is some information printed to the command line. We want to demonstrate how much debugging or @@ -54,7 +54,7 @@ include_directories(${OpenCV_INCLUDE_DIRS}) add_executable(cvvt main.cpp) target_link_libraries(cvvt - opencv_core opencv_videoio opencv_imgproc opencv_features2d + opencv_core opencv_videoio opencv_imgproc opencv_features opencv_cvv ) @endcode diff --git a/modules/julia/CMakeLists.txt b/modules/julia/CMakeLists.txt index fcf380d7d6f..859d61ac1b6 100644 --- a/modules/julia/CMakeLists.txt +++ b/modules/julia/CMakeLists.txt @@ -66,7 +66,7 @@ ocv_add_module( opencv_highgui opencv_videoio opencv_dnn - opencv_features2d + opencv_features opencv_objdetect opencv_calib3d ) diff --git a/modules/julia/gen/binding_templates_cpp/cv_core.cpp b/modules/julia/gen/binding_templates_cpp/cv_core.cpp index 9966ea17747..83881b80ee5 100644 --- a/modules/julia/gen/binding_templates_cpp/cv_core.cpp +++ b/modules/julia/gen/binding_templates_cpp/cv_core.cpp @@ -40,7 +40,7 @@ typedef ParameterList> type; // Manual Wrapping BEGIN // -#ifdef HAVE_OPENCV_FEATURES2D +#ifdef HAVE_OPENCV_FEATURES // template <> // struct SuperType // { @@ -127,7 +127,7 @@ JLCXX_MODULE cv_wrap(jlcxx::Module &mod) mod.set_const("CASCADE_SCALE_IMAGE", (int)cv::CASCADE_SCALE_IMAGE); #endif -#ifdef HAVE_OPENCV_FEATURES2D +#ifdef HAVE_OPENCV_FEATURES mod.add_type("Feature2D"); mod.add_type("SimpleBlobDetector", jlcxx::julia_base_type()); mod.add_type("SimpleBlobDetector_Params"); @@ -139,7 +139,7 @@ JLCXX_MODULE cv_wrap(jlcxx::Module &mod) ${cpp_code} -#ifdef HAVE_OPENCV_FEATURES2D +#ifdef HAVE_OPENCV_FEATURES mod.method("jlopencv_cv_cv_Feature2D_cv_Feature2D_detect", [](cv::Ptr &cobj, Mat &image, Mat &mask) {vector keypoints; cobj->detect(image, keypoints, mask); return keypoints; }); mod.method("jlopencv_cv_cv_SimpleBlobDetector_create", [](SimpleBlobDetector_Params ¶meters) { auto retval = cv::SimpleBlobDetector::create(parameters); return retval; }); diff --git a/modules/julia/gen/cpp_files/jlcv.hpp b/modules/julia/gen/cpp_files/jlcv.hpp index 62d786d86b1..f82fefd8b8f 100644 --- a/modules/julia/gen/cpp_files/jlcv.hpp +++ b/modules/julia/gen/cpp_files/jlcv.hpp @@ -40,8 +40,8 @@ using namespace jlcxx; #include #endif -#ifdef HAVE_OPENCV_FEATURES2D -#include +#ifdef HAVE_OPENCV_FEATURES +#include typedef SimpleBlobDetector::Params SimpleBlobDetector_Params; typedef AKAZE::DescriptorType AKAZE_DescriptorType; typedef AgastFeatureDetector::DetectorType AgastFeatureDetector_DetectorType; diff --git a/modules/line_descriptor/CMakeLists.txt b/modules/line_descriptor/CMakeLists.txt index 0c18edf7d4a..2fcbb65437c 100644 --- a/modules/line_descriptor/CMakeLists.txt +++ b/modules/line_descriptor/CMakeLists.txt @@ -1,2 +1,2 @@ set(the_description "Line descriptor") -ocv_define_module(line_descriptor opencv_imgproc OPTIONAL opencv_features2d WRAP python) +ocv_define_module(line_descriptor opencv_imgproc OPTIONAL opencv_features WRAP python) diff --git a/modules/line_descriptor/include/opencv2/line_descriptor/descriptor.hpp b/modules/line_descriptor/include/opencv2/line_descriptor/descriptor.hpp index 0a790f8aa34..55aaeafe212 100644 --- a/modules/line_descriptor/include/opencv2/line_descriptor/descriptor.hpp +++ b/modules/line_descriptor/include/opencv2/line_descriptor/descriptor.hpp @@ -176,7 +176,7 @@ struct CV_EXPORTS_W_SIMPLE KeyLine binary descriptor. Class' interface is mainly based on the ones of classical detectors and extractors, such as -Feature2d's @ref features2d_main and @ref features2d_match. Retrieved information about lines is +Feature2d's @ref features_main and @ref features_match. Retrieved information about lines is stored in line_descriptor::KeyLine objects. */ class CV_EXPORTS_W BinaryDescriptor : public Algorithm @@ -979,7 +979,7 @@ LSDParam params; }; /** @brief furnishes all functionalities for querying a dataset provided by user or internal to -class (that user must, anyway, populate) on the model of @ref features2d_match +class (that user must, anyway, populate) on the model of @ref features_match Once descriptors have been extracted from an image (both they represent lines and points), it diff --git a/modules/line_descriptor/samples/compute_descriptors.cpp b/modules/line_descriptor/samples/compute_descriptors.cpp index 214b29d4f9d..3bbcf632566 100644 --- a/modules/line_descriptor/samples/compute_descriptors.cpp +++ b/modules/line_descriptor/samples/compute_descriptors.cpp @@ -42,12 +42,12 @@ #include #include -#ifdef HAVE_OPENCV_FEATURES2D +#ifdef HAVE_OPENCV_FEATURES #include #include #include -#include +#include #include using namespace cv; @@ -104,8 +104,8 @@ int main( int argc, char** argv ) int main() { - std::cerr << "OpenCV was built without features2d module" << std::endl; + std::cerr << "OpenCV was built without features module" << std::endl; return 0; } -#endif // HAVE_OPENCV_FEATURES2D +#endif // HAVE_OPENCV_FEATURES diff --git a/modules/line_descriptor/samples/knn_matching.cpp b/modules/line_descriptor/samples/knn_matching.cpp index 55df693dee1..0ec714e3b25 100644 --- a/modules/line_descriptor/samples/knn_matching.cpp +++ b/modules/line_descriptor/samples/knn_matching.cpp @@ -42,12 +42,12 @@ #include #include -#ifdef HAVE_OPENCV_FEATURES2D +#ifdef HAVE_OPENCV_FEATURES #include #include #include -#include +#include #include #include @@ -201,8 +201,8 @@ int main( int argc, char** argv ) int main() { - std::cerr << "OpenCV was built without features2d module" << std::endl; + std::cerr << "OpenCV was built without features module" << std::endl; return 0; } -#endif // HAVE_OPENCV_FEATURES2D +#endif // HAVE_OPENCV_FEATURES diff --git a/modules/line_descriptor/samples/lines_extraction.cpp b/modules/line_descriptor/samples/lines_extraction.cpp index f8adc1fd0a2..6a0bed9c498 100644 --- a/modules/line_descriptor/samples/lines_extraction.cpp +++ b/modules/line_descriptor/samples/lines_extraction.cpp @@ -42,12 +42,12 @@ #include #include -#ifdef HAVE_OPENCV_FEATURES2D +#ifdef HAVE_OPENCV_FEATURES #include #include #include -#include +#include #include using namespace cv; @@ -128,8 +128,8 @@ int main( int argc, char** argv ) int main() { - std::cerr << "OpenCV was built without features2d module" << std::endl; + std::cerr << "OpenCV was built without features module" << std::endl; return 0; } -#endif // HAVE_OPENCV_FEATURES2D +#endif // HAVE_OPENCV_FEATURES diff --git a/modules/line_descriptor/samples/lsd_lines_extraction.cpp b/modules/line_descriptor/samples/lsd_lines_extraction.cpp index da012259837..a3356d00363 100644 --- a/modules/line_descriptor/samples/lsd_lines_extraction.cpp +++ b/modules/line_descriptor/samples/lsd_lines_extraction.cpp @@ -42,12 +42,12 @@ #include #include -#ifdef HAVE_OPENCV_FEATURES2D +#ifdef HAVE_OPENCV_FEATURES #include #include #include -#include +#include #include using namespace cv; @@ -128,8 +128,8 @@ int main( int argc, char** argv ) int main() { - std::cerr << "OpenCV was built without features2d module" << std::endl; + std::cerr << "OpenCV was built without features module" << std::endl; return 0; } -#endif // HAVE_OPENCV_FEATURES2D +#endif // HAVE_OPENCV_FEATURES diff --git a/modules/line_descriptor/samples/matching.cpp b/modules/line_descriptor/samples/matching.cpp index 9353f85d2c7..0b5aaa2a73a 100644 --- a/modules/line_descriptor/samples/matching.cpp +++ b/modules/line_descriptor/samples/matching.cpp @@ -42,12 +42,12 @@ #include #include -#ifdef HAVE_OPENCV_FEATURES2D +#ifdef HAVE_OPENCV_FEATURES #include #include #include -#include +#include #include #define MATCHES_DIST_THRESHOLD 25 @@ -213,8 +213,8 @@ int main( int argc, char** argv ) int main() { - std::cerr << "OpenCV was built without features2d module" << std::endl; + std::cerr << "OpenCV was built without features module" << std::endl; return 0; } -#endif // HAVE_OPENCV_FEATURES2D +#endif // HAVE_OPENCV_FEATURES diff --git a/modules/line_descriptor/samples/radius_matching.cpp b/modules/line_descriptor/samples/radius_matching.cpp index 05b26c6059a..824410fc668 100644 --- a/modules/line_descriptor/samples/radius_matching.cpp +++ b/modules/line_descriptor/samples/radius_matching.cpp @@ -42,12 +42,12 @@ #include #include -#ifdef HAVE_OPENCV_FEATURES2D +#ifdef HAVE_OPENCV_FEATURES #include #include #include -#include +#include #include #include @@ -148,8 +148,8 @@ int main( int argc, char** argv ) int main() { - std::cerr << "OpenCV was built without features2d module" << std::endl; + std::cerr << "OpenCV was built without features module" << std::endl; return 0; } -#endif // HAVE_OPENCV_FEATURES2D +#endif // HAVE_OPENCV_FEATURES diff --git a/modules/matlab/CMakeLists.txt b/modules/matlab/CMakeLists.txt index 7085547798b..17fd8427445 100644 --- a/modules/matlab/CMakeLists.txt +++ b/modules/matlab/CMakeLists.txt @@ -108,7 +108,7 @@ ocv_add_module(matlab BINDINGS OPTIONAL opencv_core opencv_imgproc opencv_ml opencv_imgcodecs opencv_videoio opencv_highgui - opencv_objdetect opencv_flann opencv_features2d + opencv_objdetect opencv_flann opencv_features opencv_photo opencv_video opencv_videostab opencv_calib opencv_3d opencv_stitching opencv_superres diff --git a/modules/saliency/CMakeLists.txt b/modules/saliency/CMakeLists.txt index f9bbffc9177..f8713dde5f7 100644 --- a/modules/saliency/CMakeLists.txt +++ b/modules/saliency/CMakeLists.txt @@ -4,6 +4,6 @@ endif() set(the_description "Saliency API") -ocv_define_module(saliency opencv_imgproc opencv_features2d WRAP python) +ocv_define_module(saliency opencv_imgproc opencv_features WRAP python) ocv_warnings_disable(CMAKE_CXX_FLAGS -Woverloaded-virtual) diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt index 570994309cd..d20f19011c3 100644 --- a/modules/sfm/CMakeLists.txt +++ b/modules/sfm/CMakeLists.txt @@ -111,7 +111,7 @@ endif() ocv_add_module(sfm opencv_core opencv_3d - opencv_features2d + opencv_features opencv_xfeatures2d opencv_imgcodecs WRAP python diff --git a/modules/sfm/src/libmv_light/libmv/correspondence/feature_matching.cc b/modules/sfm/src/libmv_light/libmv/correspondence/feature_matching.cc index c59db04dccc..df09f2ed732 100644 --- a/modules/sfm/src/libmv_light/libmv/correspondence/feature_matching.cc +++ b/modules/sfm/src/libmv_light/libmv/correspondence/feature_matching.cc @@ -18,7 +18,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. -#include +#include #include "libmv/correspondence/feature_matching.h" diff --git a/modules/sfm/src/libmv_light/libmv/correspondence/matches.h b/modules/sfm/src/libmv_light/libmv/correspondence/matches.h index 23871d1bdcb..33eaa1421ce 100644 --- a/modules/sfm/src/libmv_light/libmv/correspondence/matches.h +++ b/modules/sfm/src/libmv_light/libmv/correspondence/matches.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include "libmv/base/vector.h" // TODO(julien) use the bipartite_graph_new.h now diff --git a/modules/text/CMakeLists.txt b/modules/text/CMakeLists.txt index 0fe7e6fb24d..934183646ee 100644 --- a/modules/text/CMakeLists.txt +++ b/modules/text/CMakeLists.txt @@ -5,7 +5,7 @@ if(DEBUG_opencv_text) endif() ocv_define_module(text - opencv_ml opencv_imgproc opencv_core opencv_features2d opencv_dnn + opencv_ml opencv_imgproc opencv_core opencv_features opencv_dnn ${__extra_deps} WRAP python diff --git a/modules/text/samples/webcam_demo.cpp b/modules/text/samples/webcam_demo.cpp index 4fece6b8f60..1172ba31c58 100644 --- a/modules/text/samples/webcam_demo.cpp +++ b/modules/text/samples/webcam_demo.cpp @@ -10,7 +10,7 @@ #include "opencv2/text.hpp" #include "opencv2/highgui.hpp" #include "opencv2/imgproc.hpp" -#include "opencv2/features2d.hpp" +#include "opencv2/features.hpp" #include diff --git a/modules/videostab/CMakeLists.txt b/modules/videostab/CMakeLists.txt index 6276f27f3cf..8cc606e1550 100644 --- a/modules/videostab/CMakeLists.txt +++ b/modules/videostab/CMakeLists.txt @@ -8,5 +8,5 @@ if(DEFINED WINRT AND NOT DEFINED ENABLE_WINRT_MODE_NATIVE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW") endif() -ocv_define_module(videostab opencv_imgproc opencv_features2d opencv_video opencv_photo opencv_3d +ocv_define_module(videostab opencv_imgproc opencv_features opencv_video opencv_photo opencv_3d OPTIONAL opencv_cudawarping opencv_cudaoptflow opencv_videoio WRAP python) diff --git a/modules/videostab/include/opencv2/videostab/global_motion.hpp b/modules/videostab/include/opencv2/videostab/global_motion.hpp index 24291c2db4b..0283818d818 100644 --- a/modules/videostab/include/opencv2/videostab/global_motion.hpp +++ b/modules/videostab/include/opencv2/videostab/global_motion.hpp @@ -46,7 +46,7 @@ #include #include #include "opencv2/core.hpp" -#include "opencv2/features2d.hpp" +#include "opencv2/features.hpp" #include "opencv2/opencv_modules.hpp" #include "opencv2/videostab/optical_flow.hpp" #include "opencv2/videostab/motion_core.hpp" diff --git a/modules/videostab/src/precomp.hpp b/modules/videostab/src/precomp.hpp index 3c78087e0ce..a7482aa105d 100644 --- a/modules/videostab/src/precomp.hpp +++ b/modules/videostab/src/precomp.hpp @@ -50,7 +50,7 @@ #include "opencv2/core.hpp" #include "opencv2/imgproc.hpp" #include "opencv2/video.hpp" -#include "opencv2/features2d.hpp" +#include "opencv2/features.hpp" #include "opencv2/3d.hpp" #include "opencv2/core/private.hpp" diff --git a/modules/viz/CMakeLists.txt b/modules/viz/CMakeLists.txt index a42fdf0b3e8..770c0940871 100644 --- a/modules/viz/CMakeLists.txt +++ b/modules/viz/CMakeLists.txt @@ -32,7 +32,7 @@ ocv_create_module() ocv_add_accuracy_tests() ocv_add_perf_tests() -ocv_add_samples(opencv_imgproc opencv_3d opencv_features2d opencv_flann) +ocv_add_samples(opencv_imgproc opencv_3d opencv_features opencv_flann) if (VTK_VERSION VERSION_LESS "8.90.0") diff --git a/modules/xfeatures2d/CMakeLists.txt b/modules/xfeatures2d/CMakeLists.txt index a261b6a8ecb..32c85121e42 100644 --- a/modules/xfeatures2d/CMakeLists.txt +++ b/modules/xfeatures2d/CMakeLists.txt @@ -3,7 +3,7 @@ set(the_description "Contributed/Experimental Algorithms for Salient 2D Features if(HAVE_CUDA) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) endif() -ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_3d OPTIONAL opencv_shape opencv_ml opencv_cudaarithm WRAP python java objc) +ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features opencv_3d OPTIONAL opencv_shape opencv_ml opencv_cudaarithm WRAP python java objc) if(NOT OPENCV_SKIP_FEATURES2D_DOWNLOADING) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_vgg.cmake) @@ -14,12 +14,12 @@ if(NOT OPENCV_SKIP_FEATURES2D_DOWNLOADING) if(boost_status) ocv_append_source_file_compile_definitions(${CMAKE_CURRENT_SOURCE_DIR}/src/boostdesc.cpp "OPENCV_XFEATURES2D_HAS_BOOST_DATA=1") else() - message(WARNING "features2d: Boost descriptor implementation is not available due to missing data (download failed: https://github.com/opencv/opencv_contrib/issues/1301)") + message(WARNING "xfeatures2d: Boost descriptor implementation is not available due to missing data (download failed: https://github.com/opencv/opencv_contrib/issues/1301)") endif() if(vgg_status) ocv_append_source_file_compile_definitions(${CMAKE_CURRENT_SOURCE_DIR}/src/vgg.cpp "OPENCV_XFEATURES2D_HAS_VGG_DATA=1") else() - message(WARNING "features2d: VGG descriptor implementation is not available due to missing data (download failed: https://github.com/opencv/opencv_contrib/issues/1301)") + message(WARNING "xfeatures2d: VGG descriptor implementation is not available due to missing data (download failed: https://github.com/opencv/opencv_contrib/issues/1301)") endif() if(boost_status OR vgg_status) diff --git a/modules/xfeatures2d/include/opencv2/xfeatures2d.hpp b/modules/xfeatures2d/include/opencv2/xfeatures2d.hpp index 7a51572168a..34260ff3c3d 100644 --- a/modules/xfeatures2d/include/opencv2/xfeatures2d.hpp +++ b/modules/xfeatures2d/include/opencv2/xfeatures2d.hpp @@ -39,7 +39,7 @@ the use of this software, even if advised of the possibility of such damage. #ifndef __OPENCV_XFEATURES2D_HPP__ #define __OPENCV_XFEATURES2D_HPP__ -#include "opencv2/features2d.hpp" +#include "opencv2/features.hpp" #include "opencv2/xfeatures2d/nonfree.hpp" /** @defgroup xfeatures2d Extra 2D Features Framework diff --git a/modules/xfeatures2d/include/opencv2/xfeatures2d/nonfree.hpp b/modules/xfeatures2d/include/opencv2/xfeatures2d/nonfree.hpp index 5fb299f20f4..5e99da41047 100644 --- a/modules/xfeatures2d/include/opencv2/xfeatures2d/nonfree.hpp +++ b/modules/xfeatures2d/include/opencv2/xfeatures2d/nonfree.hpp @@ -43,7 +43,7 @@ #ifndef __OPENCV_XFEATURES2D_FEATURES_2D_HPP__ #define __OPENCV_XFEATURES2D_FEATURES_2D_HPP__ -#include "opencv2/features2d.hpp" +#include "opencv2/features.hpp" namespace cv { diff --git a/modules/xfeatures2d/misc/java/test/AGASTFeatureDetectorTest.java b/modules/xfeatures2d/misc/java/test/AGASTFeatureDetectorTest.java index eaaf73ad445..6e8fc8ddbac 100644 --- a/modules/xfeatures2d/misc/java/test/AGASTFeatureDetectorTest.java +++ b/modules/xfeatures2d/misc/java/test/AGASTFeatureDetectorTest.java @@ -1,4 +1,4 @@ -package org.opencv.test.features2d; +package org.opencv.test.features; import org.opencv.test.OpenCVTestCase; import org.opencv.test.OpenCVTestRunner; diff --git a/modules/xfeatures2d/misc/java/test/AKAZEDescriptorExtractorTest.java b/modules/xfeatures2d/misc/java/test/AKAZEDescriptorExtractorTest.java index fd604cbfa46..6fd2ca8cf10 100644 --- a/modules/xfeatures2d/misc/java/test/AKAZEDescriptorExtractorTest.java +++ b/modules/xfeatures2d/misc/java/test/AKAZEDescriptorExtractorTest.java @@ -1,4 +1,4 @@ -package org.opencv.test.features2d; +package org.opencv.test.features; import org.opencv.test.OpenCVTestCase; import org.opencv.test.OpenCVTestRunner; diff --git a/modules/xfeatures2d/misc/java/test/BOWImgDescriptorExtractorTest.java b/modules/xfeatures2d/misc/java/test/BOWImgDescriptorExtractorTest.java index 317aba1671c..a36b2ca1b92 100644 --- a/modules/xfeatures2d/misc/java/test/BOWImgDescriptorExtractorTest.java +++ b/modules/xfeatures2d/misc/java/test/BOWImgDescriptorExtractorTest.java @@ -1,4 +1,4 @@ -package org.opencv.test.features2d; +package org.opencv.test.features; import org.opencv.core.Core; import org.opencv.core.CvType; @@ -7,8 +7,8 @@ import org.opencv.core.Point; import org.opencv.core.Scalar; import org.opencv.core.KeyPoint; -import org.opencv.features2d.ORB; -import org.opencv.features2d.DescriptorMatcher; +import org.opencv.features.ORB; +import org.opencv.features.DescriptorMatcher; import org.opencv.xfeatures2d.BOWImgDescriptorExtractor; import org.opencv.test.OpenCVTestCase; import org.opencv.test.OpenCVTestRunner; diff --git a/modules/xfeatures2d/misc/java/test/BRIEFDescriptorExtractorTest.java b/modules/xfeatures2d/misc/java/test/BRIEFDescriptorExtractorTest.java index a8744635ee1..64b68290b3f 100644 --- a/modules/xfeatures2d/misc/java/test/BRIEFDescriptorExtractorTest.java +++ b/modules/xfeatures2d/misc/java/test/BRIEFDescriptorExtractorTest.java @@ -1,4 +1,4 @@ -package org.opencv.test.features2d; +package org.opencv.test.features; import org.opencv.core.CvType; import org.opencv.core.Mat; @@ -9,7 +9,7 @@ import org.opencv.test.OpenCVTestCase; import org.opencv.test.OpenCVTestRunner; import org.opencv.imgproc.Imgproc; -import org.opencv.features2d.Feature2D; +import org.opencv.features.Feature2D; public class BRIEFDescriptorExtractorTest extends OpenCVTestCase { diff --git a/modules/xfeatures2d/misc/java/test/BRISKDescriptorExtractorTest.java b/modules/xfeatures2d/misc/java/test/BRISKDescriptorExtractorTest.java index ff7c29db8a7..a42351e38fe 100644 --- a/modules/xfeatures2d/misc/java/test/BRISKDescriptorExtractorTest.java +++ b/modules/xfeatures2d/misc/java/test/BRISKDescriptorExtractorTest.java @@ -1,4 +1,4 @@ -package org.opencv.test.features2d; +package org.opencv.test.features; import org.opencv.test.OpenCVTestCase; import org.opencv.test.OpenCVTestRunner; diff --git a/modules/xfeatures2d/misc/java/test/DAISYDescriptorExtractorTest.java b/modules/xfeatures2d/misc/java/test/DAISYDescriptorExtractorTest.java index 97d3063cbb6..19bca3ac790 100644 --- a/modules/xfeatures2d/misc/java/test/DAISYDescriptorExtractorTest.java +++ b/modules/xfeatures2d/misc/java/test/DAISYDescriptorExtractorTest.java @@ -1,4 +1,4 @@ -package org.opencv.test.features2d; +package org.opencv.test.features; import org.opencv.test.OpenCVTestCase; import org.opencv.test.OpenCVTestRunner; diff --git a/modules/xfeatures2d/misc/java/test/FREAKDescriptorExtractorTest.java b/modules/xfeatures2d/misc/java/test/FREAKDescriptorExtractorTest.java index 4793a487834..b994318fa35 100644 --- a/modules/xfeatures2d/misc/java/test/FREAKDescriptorExtractorTest.java +++ b/modules/xfeatures2d/misc/java/test/FREAKDescriptorExtractorTest.java @@ -1,4 +1,4 @@ -package org.opencv.test.features2d; +package org.opencv.test.features; import org.opencv.test.OpenCVTestCase; import org.opencv.test.OpenCVTestRunner; diff --git a/modules/xfeatures2d/misc/java/test/HARRISFeatureDetectorTest.java b/modules/xfeatures2d/misc/java/test/HARRISFeatureDetectorTest.java index 2f45a88b211..961e09d8c27 100644 --- a/modules/xfeatures2d/misc/java/test/HARRISFeatureDetectorTest.java +++ b/modules/xfeatures2d/misc/java/test/HARRISFeatureDetectorTest.java @@ -1,4 +1,4 @@ -package org.opencv.test.features2d; +package org.opencv.test.features; import org.opencv.test.OpenCVTestCase; import org.opencv.test.OpenCVTestRunner; diff --git a/modules/xfeatures2d/misc/java/test/KAZEDescriptorExtractorTest.java b/modules/xfeatures2d/misc/java/test/KAZEDescriptorExtractorTest.java index 37cbb29120f..771b97d8e30 100644 --- a/modules/xfeatures2d/misc/java/test/KAZEDescriptorExtractorTest.java +++ b/modules/xfeatures2d/misc/java/test/KAZEDescriptorExtractorTest.java @@ -1,4 +1,4 @@ -package org.opencv.test.features2d; +package org.opencv.test.features; import org.opencv.test.OpenCVTestCase; import org.opencv.test.OpenCVTestRunner; diff --git a/modules/xfeatures2d/misc/java/test/LATCHDescriptorExtractorTest.java b/modules/xfeatures2d/misc/java/test/LATCHDescriptorExtractorTest.java index 10802d21990..b8c797707e6 100644 --- a/modules/xfeatures2d/misc/java/test/LATCHDescriptorExtractorTest.java +++ b/modules/xfeatures2d/misc/java/test/LATCHDescriptorExtractorTest.java @@ -1,4 +1,4 @@ -package org.opencv.test.features2d; +package org.opencv.test.features; import org.opencv.test.OpenCVTestCase; import org.opencv.test.OpenCVTestRunner; diff --git a/modules/xfeatures2d/misc/java/test/LUCIDDescriptorExtractorTest.java b/modules/xfeatures2d/misc/java/test/LUCIDDescriptorExtractorTest.java index 295fc215f5e..7703446674f 100644 --- a/modules/xfeatures2d/misc/java/test/LUCIDDescriptorExtractorTest.java +++ b/modules/xfeatures2d/misc/java/test/LUCIDDescriptorExtractorTest.java @@ -1,4 +1,4 @@ -package org.opencv.test.features2d; +package org.opencv.test.features; import org.opencv.test.OpenCVTestCase; import org.opencv.test.OpenCVTestRunner; diff --git a/modules/xfeatures2d/misc/java/test/MSDFeatureDetectorTest.java b/modules/xfeatures2d/misc/java/test/MSDFeatureDetectorTest.java index be0ec8857b9..b6382a9d0fa 100644 --- a/modules/xfeatures2d/misc/java/test/MSDFeatureDetectorTest.java +++ b/modules/xfeatures2d/misc/java/test/MSDFeatureDetectorTest.java @@ -1,4 +1,4 @@ -package org.opencv.test.features2d; +package org.opencv.test.features; import org.opencv.test.OpenCVTestCase; import org.opencv.test.OpenCVTestRunner; diff --git a/modules/xfeatures2d/misc/java/test/STARFeatureDetectorTest.java b/modules/xfeatures2d/misc/java/test/STARFeatureDetectorTest.java index 88d3dade896..80c4efa1995 100644 --- a/modules/xfeatures2d/misc/java/test/STARFeatureDetectorTest.java +++ b/modules/xfeatures2d/misc/java/test/STARFeatureDetectorTest.java @@ -1,4 +1,4 @@ -package org.opencv.test.features2d; +package org.opencv.test.features; import java.util.Arrays; diff --git a/modules/xfeatures2d/misc/java/test/SURFDescriptorExtractorTest.java b/modules/xfeatures2d/misc/java/test/SURFDescriptorExtractorTest.java index e2bac918d85..3ef22ba0290 100644 --- a/modules/xfeatures2d/misc/java/test/SURFDescriptorExtractorTest.java +++ b/modules/xfeatures2d/misc/java/test/SURFDescriptorExtractorTest.java @@ -1,4 +1,4 @@ -package org.opencv.test.features2d; +package org.opencv.test.features; import org.opencv.core.CvType; import org.opencv.core.Mat; diff --git a/modules/xfeatures2d/misc/java/test/SURFFeatureDetectorTest.java b/modules/xfeatures2d/misc/java/test/SURFFeatureDetectorTest.java index 6e46371b969..e22690b44aa 100644 --- a/modules/xfeatures2d/misc/java/test/SURFFeatureDetectorTest.java +++ b/modules/xfeatures2d/misc/java/test/SURFFeatureDetectorTest.java @@ -1,4 +1,4 @@ -package org.opencv.test.features2d; +package org.opencv.test.features; import java.util.ArrayList; import java.util.Arrays; diff --git a/modules/xfeatures2d/samples/LATCH_match.cpp b/modules/xfeatures2d/samples/LATCH_match.cpp index e7889f08ea5..209778eecd7 100644 --- a/modules/xfeatures2d/samples/LATCH_match.cpp +++ b/modules/xfeatures2d/samples/LATCH_match.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/modules/xfeatures2d/samples/bagofwords_classification.cpp b/modules/xfeatures2d/samples/bagofwords_classification.cpp index 222c949b403..c209ecaafd1 100644 --- a/modules/xfeatures2d/samples/bagofwords_classification.cpp +++ b/modules/xfeatures2d/samples/bagofwords_classification.cpp @@ -6,7 +6,7 @@ #include "opencv2/imgcodecs.hpp" #include "opencv2/highgui.hpp" #include "opencv2/imgproc.hpp" -#include "opencv2/features2d.hpp" +#include "opencv2/features.hpp" #include "opencv2/xfeatures2d.hpp" #include "opencv2/ml.hpp" diff --git a/modules/xfeatures2d/samples/gms_matcher.cpp b/modules/xfeatures2d/samples/gms_matcher.cpp index 007d264d36f..c07ab091499 100644 --- a/modules/xfeatures2d/samples/gms_matcher.cpp +++ b/modules/xfeatures2d/samples/gms_matcher.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include diff --git a/modules/xfeatures2d/samples/shape_transformation.cpp b/modules/xfeatures2d/samples/shape_transformation.cpp index 35526c77bad..88f77f5877f 100644 --- a/modules/xfeatures2d/samples/shape_transformation.cpp +++ b/modules/xfeatures2d/samples/shape_transformation.cpp @@ -10,7 +10,7 @@ #include "opencv2/imgcodecs.hpp" #include "opencv2/highgui.hpp" #include "opencv2/imgproc.hpp" -#include "opencv2/features2d.hpp" +#include "opencv2/features.hpp" #include "opencv2/xfeatures2d.hpp" #include "opencv2/core/utility.hpp" #include diff --git a/modules/xfeatures2d/samples/surf_matcher.cpp b/modules/xfeatures2d/samples/surf_matcher.cpp index 6038158e0b5..8550750b49e 100644 --- a/modules/xfeatures2d/samples/surf_matcher.cpp +++ b/modules/xfeatures2d/samples/surf_matcher.cpp @@ -5,7 +5,7 @@ #include "opencv2/core/ocl.hpp" #include "opencv2/imgcodecs.hpp" #include "opencv2/highgui.hpp" -#include "opencv2/features2d.hpp" +#include "opencv2/features.hpp" #include "opencv2/3d.hpp" #include "opencv2/imgproc.hpp" #include "opencv2/xfeatures2d.hpp" diff --git a/modules/xfeatures2d/samples/video_homography.cpp b/modules/xfeatures2d/samples/video_homography.cpp index bb1ce0b9429..ee50cc9c1ba 100644 --- a/modules/xfeatures2d/samples/video_homography.cpp +++ b/modules/xfeatures2d/samples/video_homography.cpp @@ -14,7 +14,7 @@ #include "opencv2/videoio.hpp" #include "opencv2/highgui.hpp" #include "opencv2/imgproc.hpp" -#include "opencv2/features2d.hpp" +#include "opencv2/features.hpp" #include "opencv2/xfeatures2d.hpp" #include #include @@ -25,7 +25,7 @@ using namespace cv::xfeatures2d; static void help(char **av) { - cout << "\nThis program demonstrated the use of features2d with the Fast corner detector and brief descriptors\n" + cout << "\nThis program demonstrated the use of features with the Fast corner detector and brief descriptors\n" << "to track planar objects by computing their homography from the key (training) image to the query (test) image\n\n" << endl; cout << "usage: " << av[0] << "