renamed gpu namespace -> cuda

This commit is contained in:
Vladislav Vinogradov
2013-08-28 15:45:13 +04:00
parent e12496d150
commit e895b7455e
343 changed files with 3882 additions and 3882 deletions

View File

@@ -48,7 +48,7 @@
#include "opencv2/gpulegacy/NCV.hpp"
#include "opencv2/core/cuda/common.hpp"
namespace cv { namespace gpu { namespace cudev
namespace cv { namespace cuda { namespace cudev
{
namespace pyramid
{

View File

@@ -56,7 +56,7 @@
#include "opencv2/gpulegacy.hpp"
namespace cv { namespace gpu
namespace cv { namespace cuda
{
class NppStStreamHandler
{
@@ -88,9 +88,9 @@ namespace cv { namespace gpu
}}
#if defined(__GNUC__)
#define ncvSafeCall(expr) cv::gpu::checkNcvError(expr, __FILE__, __LINE__, __func__)
#define ncvSafeCall(expr) cv::cuda::checkNcvError(expr, __FILE__, __LINE__, __func__)
#else /* defined(__CUDACC__) || defined(__MSVC__) */
#define ncvSafeCall(expr) cv::gpu::checkNcvError(expr, __FILE__, __LINE__, "")
#define ncvSafeCall(expr) cv::cuda::checkNcvError(expr, __FILE__, __LINE__, "")
#endif
#endif // __OPENCV_CORE_GPULEGACY_PRIVATE_HPP__