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/src/precomp.hpp
+++ b/modules/stitching/src/precomp.hpp
@@ -71,7 +71,10 @@
 #include "opencv2/features2d.hpp"
 #include "opencv2/calib3d.hpp"
 #ifdef HAVE_OPENCV_GPU
-# include "opencv2/gpu.hpp"
+#  include "opencv2/gpu.hpp"
+#  ifdef HAVE_OPENCV_NONFREE
+#    include "opencv2/nonfree/gpu.hpp"
+#  endif
 #endif

 #include "../../imgproc/src/gcgraph.hpp"