mirror of
https://github.com/opencv/opencv.git
synced 2026-07-25 21:33:04 +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:
@@ -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
|
||||
|
||||
+1
-1
@@ -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
-1
@@ -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>
|
||||
+1
-1
@@ -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>
|
||||
+1
-1
@@ -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;
|
||||
+1
-1
@@ -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;
|
||||
+1
-1
@@ -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;
|
||||
+1
-1
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user