1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Merge pull request #26405 from kaingwade:rename_features2d

Rename features2d #26405

This PR renames the module _features2d_ to _features_ as one of the Big OpenCV Cleanup #25007. 
Related PR: opencv/opencv_contrib: [#3820](https://github.com/opencv/opencv_contrib/pull/3820) opencv/ci-gha-workflow: [#192](https://github.com/opencv/ci-gha-workflow/pull/192)
This commit is contained in:
WU Jia
2024-11-12 16:04:48 +08:00
committed by GitHub
parent c7a21dc5bf
commit 614e250fd3
260 changed files with 273 additions and 268 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ set(OPENCV_CPP_SAMPLES_REQUIRED_DEPS
opencv_video
opencv_objdetect
opencv_photo
opencv_features2d
opencv_features
opencv_3d
opencv_stereo
opencv_calib
+1 -1
View File
@@ -1,6 +1,6 @@
#include <opencv2/core.hpp>
#include <opencv2/imgproc.hpp>
#include <opencv2/features2d.hpp>
#include <opencv2/features.hpp>
#include <opencv2/highgui.hpp>
#include <opencv2/3d.hpp>
#include <iostream>
+1 -1
View File
@@ -1,7 +1,7 @@
#include <opencv2/core.hpp>
#include <opencv2/imgproc.hpp>
#include <opencv2/highgui.hpp>
#include <opencv2/features2d.hpp>
#include <opencv2/features.hpp>
#include "opencv2/core/opengl.hpp"
#include <vector>
+1 -1
View File
@@ -3,7 +3,7 @@
// of this distribution and at http://opencv.org/license.html
#include "opencv2/3d.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/features.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
+1 -1
View File
@@ -6,7 +6,7 @@
#include "opencv2/core.hpp"
#include "opencv2/core/utils/filesystem.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/features.hpp"
#include "opencv2/flann.hpp"
using namespace cv;
+1 -1
View File
@@ -1,7 +1,7 @@
#include <opencv2/core.hpp>
#include <opencv2/imgproc.hpp>
#include <opencv2/highgui.hpp>
#include <opencv2/features2d.hpp>
#include <opencv2/features.hpp>
#include <vector>
#include <map>
#include <iostream>
+1 -1
View File
@@ -3,7 +3,7 @@
// of this distribution and at http://opencv.org/license.html
#include "opencv2/3d.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/features.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
@@ -10,7 +10,7 @@
#include <iostream>
#include <opencv2/core/core.hpp>
#include <opencv2/features2d/features2d.hpp>
#include <opencv2/features/features.hpp>
class Model
{
@@ -8,7 +8,7 @@
#include "RobustMatcher.h"
#include <time.h>
#include <opencv2/features2d/features2d.hpp>
#include <opencv2/features/features.hpp>
RobustMatcher::~RobustMatcher()
{
@@ -12,7 +12,7 @@
#include <opencv2/core/core.hpp>
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/features2d/features2d.hpp>
#include <opencv2/features/features.hpp>
class RobustMatcher {
public:
@@ -10,7 +10,7 @@
#include <iostream>
#include <opencv2/features2d.hpp>
#include <opencv2/features.hpp>
#include "PnPProblem.h"
// Draw a text with the question point
@@ -4,7 +4,7 @@
#include <opencv2/core.hpp>
#include <opencv2/imgproc.hpp>
#include <opencv2/3d.hpp>
#include <opencv2/features2d.hpp>
#include <opencv2/features.hpp>
// PnP Tutorial
#include "Mesh.h"
#include "Model.h"
@@ -1,6 +1,6 @@
#include <iostream>
#ifdef HAVE_OPENCV_XFEATURES2D
#include <opencv2/features2d.hpp>
#include <opencv2/features.hpp>
#include "opencv2/xfeatures2d.hpp"
#include <opencv2/imgproc.hpp>
#include <opencv2/highgui.hpp>
@@ -3,7 +3,7 @@
#include <iomanip>
#ifdef HAVE_OPENCV_XFEATURES2D
#include <opencv2/features2d.hpp>
#include <opencv2/features.hpp>
#include "opencv2/xfeatures2d.hpp"
#include <opencv2/videoio.hpp>
#include <opencv2/imgproc.hpp>
@@ -2,7 +2,7 @@
#include "opencv2/core.hpp"
#ifdef HAVE_OPENCV_XFEATURES2D
#include "opencv2/highgui.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/features.hpp"
#include "opencv2/xfeatures2d.hpp"
using namespace cv;
@@ -2,7 +2,7 @@
#include "opencv2/core.hpp"
#ifdef HAVE_OPENCV_XFEATURES2D
#include "opencv2/highgui.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/features.hpp"
#include "opencv2/xfeatures2d.hpp"
using namespace cv;
@@ -2,7 +2,7 @@
#include "opencv2/core.hpp"
#ifdef HAVE_OPENCV_XFEATURES2D
#include "opencv2/highgui.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/features.hpp"
#include "opencv2/xfeatures2d.hpp"
using namespace cv;
@@ -4,7 +4,7 @@
#include "opencv2/3d.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/features.hpp"
#include "opencv2/xfeatures2d.hpp"
using namespace cv;
@@ -1,7 +1,7 @@
#include <opencv2/core.hpp>
#include <opencv2/imgproc.hpp>
#include <opencv2/highgui.hpp>
#include <opencv2/features2d.hpp>
#include <opencv2/features.hpp>
#include <iostream>
using namespace std;