potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge branch '2.4'

Browse Source
This commit is contained in:
Andrey Kamaev
2013-01-31 14:35:27 +04:00
parent 7572b4d400 53b0df87f1
commit 57d3152cd0
23 changed files with 418 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gpu/include/opencv2/gpu/device/common.hpp
+1 -1
View File
@@ -100,7 +100,7 @@ namespace cv { namespace gpu
typedef unsigned char uchar;
typedef unsigned short ushort;
typedef signed char schar;
#ifdef WIN32
#if defined (_WIN32) || defined (__APPLE__)
typedef unsigned int uint;
#endif
modules/gpu/src/cuda/canny.cu
+1
View File
@@ -43,6 +43,7 @@
#if !defined CUDA_DISABLER
#include <utility>
#include <algorithm>//std::swap
#include "opencv2/gpu/device/common.hpp"
#include "opencv2/gpu/device/emulation.hpp"
#include "opencv2/gpu/device/transform.hpp"