turn on CUDA part of nonfree module on Android for non-dynamic build(cherry picked from commit d8f7377122)

This commit is contained in:
Vladislav Vinogradov
2014-02-03 11:52:43 +04:00
committed by Alexander Smorkalov
parent f6367a2ea5
commit f15a167df4
7 changed files with 13 additions and 19 deletions

View File

@@ -43,11 +43,7 @@
#ifndef __OPENCV_NONFREE_GPU_HPP__
#define __OPENCV_NONFREE_GPU_HPP__
#include "opencv2/opencv_modules.hpp"
#if defined(HAVE_OPENCV_GPU) && !defined(ANDROID)
#include "opencv2/gpu/gpu.hpp"
#include "opencv2/core/gpumat.hpp"
namespace cv { namespace gpu {
@@ -129,6 +125,4 @@ public:
} // namespace cv
#endif // defined(HAVE_OPENCV_GPU)
#endif // __OPENCV_NONFREE_GPU_HPP__