Merge pull request #1299 from jet47:gpu-cuda-rename

This commit is contained in:
Alexander Smorkalov
2013-09-23 10:31:46 +04:00
committed by OpenCV Buildbot
601 changed files with 8873 additions and 9711 deletions

View File

@@ -47,12 +47,12 @@
#define __OPENCV_CUDEV_COMMON_HPP__
#include <cuda_runtime.h>
#include "opencv2/core/gpu.hpp"
#include "opencv2/core/gpu_stream_accessor.hpp"
#include "opencv2/core/cuda.hpp"
#include "opencv2/core/cuda_stream_accessor.hpp"
namespace cv { namespace cudev {
using namespace cv::gpu;
using namespace cv::cuda;
// CV_CUDEV_ARCH