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

This commit is contained in:
Vladislav Vinogradov
2013-06-04 13:32:35 +04:00
parent 10340fe234
commit 3eeaa9189c
472 changed files with 29894 additions and 23019 deletions

View File

@@ -55,9 +55,30 @@
#include "opencv2/video/tracking.hpp"
#include "opencv2/core/private.hpp"
#ifdef HAVE_OPENCV_GPU
# include "opencv2/gpu.hpp"
# include "opencv2/core/gpu_private.hpp"
#include "opencv2/core/gpu_private.hpp"
#ifdef HAVE_OPENCV_GPUARITHM
# include "opencv2/gpuarithm.hpp"
#endif
#ifdef HAVE_OPENCV_GPUWARPING
# include "opencv2/gpuwarping.hpp"
#endif
#ifdef HAVE_OPENCV_GPUFILTERS
# include "opencv2/gpufilters.hpp"
#endif
#ifdef HAVE_OPENCV_GPUIMGPROC
# include "opencv2/gpuimgproc.hpp"
#endif
#ifdef HAVE_OPENCV_GPUOPTFLOW
# include "opencv2/gpuoptflow.hpp"
#endif
#ifdef HAVE_OPENCV_GPUCODEC
# include "opencv2/gpucodec.hpp"
#endif
#ifdef HAVE_OPENCV_HIGHGUI