nonfree module fixes

2013-04-18 10:10:55 +04:00
parent 5d7bbdc837
commit 12f16b7a26
11 changed files with 31 additions and 44 deletions
--- a/modules/nonfree/include/opencv2/nonfree/gpu.hpp
+++ b/modules/nonfree/include/opencv2/nonfree/gpu.hpp
@@ -43,11 +43,7 @@
 #ifndef __OPENCV_NONFREE_GPU_HPP__
 #define __OPENCV_NONFREE_GPU_HPP__

-#include "opencv2/opencv_modules.hpp"
-
-#if defined(HAVE_OPENCV_GPU)
-
-#include "opencv2/gpu.hpp"
+#include "opencv2/core/gpumat.hpp"

 namespace cv { namespace gpu {

@@ -160,10 +156,6 @@ private:
    GpuMat samples_;
 };

-} // namespace gpu
-
-} // namespace cv
-
-#endif // defined(HAVE_OPENCV_GPU)
+}} // namespace cv { namespace gpu {

 #endif // __OPENCV_NONFREE_GPU_HPP__