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

Revert "Revert "Merge pull request #836 from jet47:gpu-modules""

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-06-04 13:32:35 +04:00
parent 10340fe234
commit 3eeaa9189c
472 changed files with 29894 additions and 23019 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,8 +47,9 @@
#include "opencv2/features2d.hpp"
#include "opencv2/opencv_modules.hpp"
#if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU)
#include "opencv2/nonfree/gpu.hpp"
#ifdef HAVE_OPENCV_NONFREE
# include "opencv2/nonfree/gpu.hpp"
#endif
namespace cv {
@@ -103,7 +104,7 @@ private:
};
#if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU)
#ifdef HAVE_OPENCV_NONFREE
class CV_EXPORTS SurfFeaturesFinderGpu : public FeaturesFinder
{
public:

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

@@ -44,11 +44,9 @@
#define __OPENCV_STITCHING_WARPERS_HPP__
#include "opencv2/core.hpp"
#include "opencv2/core/gpumat.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_GPU
# include "opencv2/gpu.hpp"
#endif
namespace cv {
namespace detail {
@@ -329,7 +327,7 @@ public:
};
#ifdef HAVE_OPENCV_GPU
#ifdef HAVE_OPENCV_GPUWARPING
class CV_EXPORTS PlaneWarperGpu : public PlaneWarper
{
public:

2
modules/stitching/include/opencv2/stitching/warpers.hpp
View File

@@ -145,7 +145,7 @@ public:
#ifdef HAVE_OPENCV_GPU
#ifdef HAVE_OPENCV_GPUWARPING
class PlaneWarperGpu: public WarperCreator
{
public: