opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-17 15:26:00 +08:00
Code Issues Releases Wiki Activity

fixing further nonfree elements

Browse Source
This commit is contained in:
StevenPuttemans
2014-08-27 14:04:41 +02:00
parent 071eb5a7c5
commit d27141abe3
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/matlab/CMakeLists.txt
View File

@@ -91,7 +91,7 @@ ocv_add_module(matlab BINDINGS
opencv_photo opencv_video opencv_videostab opencv_photo opencv_video opencv_videostab
opencv_calib opencv_calib3d opencv_calib opencv_calib3d
opencv_stitching opencv_superres opencv_stitching opencv_superres
opencv_nonfree opencv_xfeatures2d
) )
# get the commit information # get the commit information

2
modules/reg/samples/map_test.cpp
View File

@@ -47,7 +47,7 @@
#include <opencv2/highgui/highgui_c.h> #include <opencv2/highgui/highgui_c.h>
#ifdef COMPARE_FEATURES #ifdef COMPARE_FEATURES
#include <opencv2/nonfree.hpp> #include <opencv2/xfeatures2d/nonfree.hpp>
#include <opencv2/calib3d.hpp> #include <opencv2/calib3d.hpp>
#include <opencv2/calib3d/calib3d_c.h> #include <opencv2/calib3d/calib3d_c.h>
#endif #endif

2
modules/xfeatures2d/doc/nonfree_features.rst
View File

@@ -143,7 +143,7 @@ Detects keypoints and computes SURF descriptors for them.
The function is parallelized with the TBB library. The function is parallelized with the TBB library.
If you are using the C version, make sure you call ``cv::initModule_nonfree()`` from ``nonfree/nonfree.hpp``. If you are using the C version, make sure you call ``cv::initModule_xfeatures2d()`` from ``xfeatures2d/nonfree.hpp``.
cuda::SURF_CUDA cuda::SURF_CUDA

6
modules/xfeatures2d/include/opencv2/xfeatures2d/cuda.hpp
View File

@@ -40,8 +40,8 @@
// //
//M*/ //M*/
#ifndef __OPENCV_NONFREE_CUDA_HPP__ #ifndef __OPENCV_XFEATURES2D_CUDA_HPP__
#define __OPENCV_NONFREE_CUDA_HPP__ #define __OPENCV_XFEATURES2D_CUDA_HPP__
#include "opencv2/core/cuda.hpp" #include "opencv2/core/cuda.hpp"
@@ -125,4 +125,4 @@ public:
}} // namespace cv { namespace cuda { }} // namespace cv { namespace cuda {
#endif // __OPENCV_NONFREE_CUDA_HPP__ #endif // __OPENCV_XFEATURES2D_CUDA_HPP__

4
modules/xfeatures2d/include/opencv2/xfeatures2d/nonfree.hpp
View File

@@ -40,8 +40,8 @@
// //
//M*/ //M*/
#ifndef __OPENCV_NONFREE_FEATURES_2D_HPP__ #ifndef __OPENCV_XFEATURES2D_FEATURES_2D_HPP__
#define __OPENCV_NONFREE_FEATURES_2D_HPP__ #define __OPENCV_XFEATURES2D_FEATURES_2D_HPP__
#include "opencv2/features2d.hpp" #include "opencv2/features2d.hpp"

2
modules/xfeatures2d/perf/perf_main.cpp
View File

@@ -8,4 +8,4 @@ static const char * impls[] = {
"plain" "plain"
}; };
CV_PERF_TEST_MAIN_WITH_IMPLS(nonfree, impls, perf::printCudaInfo()) CV_PERF_TEST_MAIN_WITH_IMPLS(xfeatures2d, impls, perf::printCudaInfo())

2
modules/xfeatures2d/src/precomp.hpp
View File

@@ -52,7 +52,7 @@
#include "opencv2/core/private.hpp" #include "opencv2/core/private.hpp"
#include "opencv2/core/private.cuda.hpp" #include "opencv2/core/private.cuda.hpp"
//#include "opencv2/nonfree/cuda.hpp" //#include "opencv2/xfeatures2d/cuda.hpp"
//#include "opencv2/core/private.cuda.hpp" //#include "opencv2/core/private.cuda.hpp"
#include "opencv2/core/ocl.hpp" #include "opencv2/core/ocl.hpp"

4
modules/xfeatures2d/src/surf.hpp
View File

@@ -1,7 +1,7 @@
///////////// see LICENSE.txt in the OpenCV root directory ////////////// ///////////// see LICENSE.txt in the OpenCV root directory //////////////
#ifndef __OPENCV_NONFREE_SURF_HPP__ #ifndef __OPENCV_XFEATURES2D_SURF_HPP__
#define __OPENCV_NONFREE_SURF_HPP__ #define __OPENCV_XFEATURES2D_SURF_HPP__
namespace cv namespace cv
{ {