generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compiler errors

Browse Source
This commit is contained in:
peng xiao 2013-03-26 17:23:38 +08:00
parent 7476bf5cd7
commit 8ffc15371d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/nonfree/src/surf.ocl.cpp
View File

@ -43,6 +43,7 @@
// //
//M*/ //M*/
#include "precomp.hpp" #include "precomp.hpp"
#include <cstring>
#ifdef HAVE_OPENCV_OCL #ifdef HAVE_OPENCV_OCL

9
modules/ocl/src/initialization.cpp
View File

@ -362,9 +362,13 @@ namespace cv
case WAVEFRONT_SIZE: case WAVEFRONT_SIZE:
{ {
#ifdef CL_DEVICE_WAVEFRONT_WIDTH_AMD #ifdef CL_DEVICE_WAVEFRONT_WIDTH_AMD
try
{
openCLSafeCall(clGetDeviceInfo(Context::getContext()->impl->devices[0], openCLSafeCall(clGetDeviceInfo(Context::getContext()->impl->devices[0],
CL_DEVICE_WAVEFRONT_WIDTH_AMD, sizeof(size_t), info, 0)); CL_DEVICE_WAVEFRONT_WIDTH_AMD, sizeof(size_t), info, 0));
#else }
catch(const cv::Exception&)
#elif defined (CL_DEVICE_WARP_SIZE_NV)
const int EXT_LEN = 4096 + 1 ; const int EXT_LEN = 4096 + 1 ;
char extends_set[EXT_LEN]; char extends_set[EXT_LEN];
size_t extends_size; size_t extends_size;
@ -376,6 +380,7 @@ namespace cv
CL_DEVICE_WARP_SIZE_NV, sizeof(size_t), info, 0)); CL_DEVICE_WARP_SIZE_NV, sizeof(size_t), info, 0));
} }
else else
#endif
{ {
// if no way left for us to query the warp size, we can get it from kernel group info // if no way left for us to query the warp size, we can get it from kernel group info
static const char * _kernel_string = "__kernel void test_func() {}"; static const char * _kernel_string = "__kernel void test_func() {}";
@ -384,7 +389,7 @@ namespace cv
openCLSafeCall(clGetKernelWorkGroupInfo(kernel, impl->devices[impl->devnum], openCLSafeCall(clGetKernelWorkGroupInfo(kernel, impl->devices[impl->devnum],
CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE, sizeof(size_t), info, NULL)); CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE, sizeof(size_t), info, NULL));
} }
#endif
} }
break; break;
default: default: