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

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

Browse Source 
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
This commit is contained in:
Andrey Kamaev
2013-04-18 15:03:50 +04:00
parent fba72cb60d
commit 416fb50594
472 changed files with 22945 additions and 29803 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,9 +47,8 @@
#include "opencv2/features2d.hpp"
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_NONFREE
# include "opencv2/nonfree/gpu.hpp"
#if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU)
#include "opencv2/nonfree/gpu.hpp"
#endif
namespace cv {
@@ -104,7 +103,7 @@ private:
};
#ifdef HAVE_OPENCV_NONFREE
#if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU)
class CV_EXPORTS SurfFeaturesFinderGpu : public FeaturesFinder
{
public:

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

@@ -44,9 +44,11 @@
#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 {
@@ -327,7 +329,7 @@ public:
};
#ifdef HAVE_OPENCV_GPUWARPING
#ifdef HAVE_OPENCV_GPU
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_GPUWARPING
#ifdef HAVE_OPENCV_GPU
class PlaneWarperGpu: public WarperCreator
{
public: