projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
677c7f2
)
fixed bug with cl_long size on Win32 (thanks to Aaron Kunze)
author
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Wed, 20 Nov 2013 01:51:31 +0000
(20:51 -0500)
committer
Vadim Pisarevsky
<vadim.pisarevsky@gmail.com>
Wed, 20 Nov 2013 01:51:31 +0000
(20:51 -0500)
modules/core/src/ocl.cpp
patch
|
blob
|
history
diff --git
a/modules/core/src/ocl.cpp
b/modules/core/src/ocl.cpp
index
b2181df
..
f706487
100644
(file)
--- a/
modules/core/src/ocl.cpp
+++ b/
modules/core/src/ocl.cpp
@@
-114,8
+114,13
@@
typedef struct _cl_sampler * cl_sampler;
typedef int cl_int;
typedef unsigned cl_uint;
-typedef long cl_long;
-typedef unsigned long cl_ulong;
+#if defined (_WIN32) && defined(_MSC_VER)
+ typedef __int64 cl_long;
+ typedef unsigned __int64 cl_ulong;
+#else
+ typedef long cl_long;
+ typedef unsigned long cl_ulong;
+#endif
typedef cl_uint cl_bool; /* WARNING! Unlike cl_ types in cl_platform.h, cl_bool is not guaranteed to be the same size as the bool in kernels. */
typedef cl_ulong cl_bitfield;