generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adapted all nonfree header inclusion since it doesn't exist anymore as a module

Browse Source
This commit is contained in:
StevenPuttemans
2014-08-22 15:33:24 +02:00
parent f624f92e7a
commit 564a8ed208
12 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
View File

@@ -48,8 +48,8 @@
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_NONFREE
# include "opencv2/nonfree/cuda.hpp"
#ifdef HAVE_OPENCV_XFEATURES2D
# include "opencv2/xfeatures2d/cuda.hpp"
#endif
namespace cv {
@@ -104,7 +104,7 @@ private:
};
#ifdef HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_XFEATURES2D
class CV_EXPORTS SurfFeaturesFinderGpu : public FeaturesFinder
{
public:

8
modules/stitching/src/matchers.cpp
View File

@@ -46,10 +46,10 @@ using namespace cv;
using namespace cv::detail;
using namespace cv::cuda;
#ifdef HAVE_OPENCV_NONFREE
#include "opencv2/nonfree.hpp"
#ifdef HAVE_OPENCV_XFEATURES2D
#include "opencv2/xfeatures2d.hpp"
static bool makeUseOfNonfree = initModule_nonfree();
static bool makeUseOfNonfree = initModule_xfeatures2d();
#endif
namespace {
@@ -443,7 +443,7 @@ void OrbFeaturesFinder::find(InputArray image, ImageFeatures &features)
}
}
#ifdef HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_XFEATURES2D
SurfFeaturesFinderGpu::SurfFeaturesFinderGpu(double hess_thresh, int num_octaves, int num_layers,
int num_octaves_descr, int num_layers_descr)
{

4
modules/stitching/src/precomp.hpp
View File

@@ -87,8 +87,8 @@
# include "opencv2/cuda.hpp"
#endif
#ifdef HAVE_OPENCV_NONFREE
# include "opencv2/nonfree/cuda.hpp"
#ifdef HAVE_OPENCV_XFEATURES2D
# include "opencv2/xfeatures2d/cuda.hpp"
#endif
#include "../../imgproc/src/gcgraph.hpp"

4
modules/stitching/src/stitcher.cpp
View File

@@ -59,7 +59,7 @@ Stitcher Stitcher::createDefault(bool try_use_gpu)
#ifdef HAVE_OPENCV_CUDA
if (try_use_gpu && cuda::getCudaEnabledDeviceCount() > 0)
{
#ifdef HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_XFEATURES2D
stitcher.setFeaturesFinder(makePtr<detail::SurfFeaturesFinderGpu>());
#else
stitcher.setFeaturesFinder(makePtr<detail::OrbFeaturesFinder>());
@@ -70,7 +70,7 @@ Stitcher Stitcher::createDefault(bool try_use_gpu)
else
#endif
{
#ifdef HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_XFEATURES2D
stitcher.setFeaturesFinder(makePtr<detail::SurfFeaturesFinder>());
#else
stitcher.setFeaturesFinder(makePtr<detail::OrbFeaturesFinder>());

2
modules/stitching/test/test_matchers.cpp
View File

@@ -42,7 +42,7 @@
#include "test_precomp.hpp"
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_NONFREE
#ifdef HAVE_OPENCV_XFEATURES2D
using namespace cv;
using namespace std;