opencv-macosx10.8.patch
b/modules/gpu/include/opencv2/gpu/device/common.hpp | ||
---|---|---|
100 | 100 |
typedef unsigned char uchar; |
101 | 101 |
typedef unsigned short ushort; |
102 | 102 |
typedef signed char schar; |
103 |
#ifdef WIN32 |
|
103 |
//#ifdef WIN32
|
|
104 | 104 |
typedef unsigned int uint; |
105 |
#endif |
|
105 |
//#endif
|
|
106 | 106 | |
107 | 107 |
template<class T> inline void bindTexture(const textureReference* tex, const PtrStepSz<T>& img) |
108 | 108 |
{ |
b/modules/gpu/src/cuda/canny.cu | ||
---|---|---|
43 | 43 |
#if !defined CUDA_DISABLER |
44 | 44 | |
45 | 45 |
#include <utility> |
46 |
#include <algorithm>//std::swap |
|
46 | 47 |
#include "opencv2/gpu/device/common.hpp" |
47 | 48 |
#include "opencv2/gpu/device/emulation.hpp" |
48 | 49 |
#include "opencv2/gpu/device/transform.hpp" |