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)

Author: kaingwade

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)

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>
 

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"
 

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>

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"

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)

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;

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;

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)

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"
 
 /**