Merge branch '2.4'

2013-03-21 20:59:18 +04:00
parent bbae05413d b6365699ee
commit 1ca8f33b4e
276 changed files with 11834 additions and 5170 deletions
--- a/modules/stitching/include/opencv2/stitching/detail/matchers.hpp
+++ b/modules/stitching/include/opencv2/stitching/detail/matchers.hpp
@@ -47,8 +47,8 @@
 #include "opencv2/features2d.hpp"

 #include "opencv2/opencv_modules.hpp"
-#ifdef HAVE_OPENCV_GPU
-#include "opencv2/gpu.hpp"
+#if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU)
+#include "opencv2/nonfree/gpu.hpp"
 #endif

 namespace cv {
@@ -103,7 +103,7 @@ private:
 };


-#ifdef HAVE_OPENCV_GPU
+#if defined(HAVE_OPENCV_NONFREE) && defined(HAVE_OPENCV_GPU)
 class CV_EXPORTS SurfFeaturesFinderGpu : public FeaturesFinder
 {
 public: