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

Fix build errors

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-18 14:42:27 +04:00
parent 1b4afcca30
commit 4bd721ad3b
11 changed files with 129 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -387,7 +387,7 @@ namespace cv
void openCLMemcpy2D(Context *clCxt, void *dst, size_t dpitch,
const void *src, size_t spitch,
size_t width, size_t height, enum openCLMemcpyKind kind, int channels)
size_t width, size_t height, openCLMemcpyKind kind, int channels)
{
size_t buffer_origin[3] = {0, 0, 0};
size_t host_origin[3] = {0, 0, 0};
@@ -593,11 +593,11 @@ namespace cv
size_t kernelWorkGroupSize;
openCLSafeCall(clGetKernelWorkGroupInfo(kernel, clCxt->impl->devices[clCxt->impl->devnum],
CL_KERNEL_WORK_GROUP_SIZE, sizeof(size_t), &kernelWorkGroupSize, 0));
CV_Assert( (localThreads[0] <= clCxt->impl->maxWorkItemSizes[0]) &&
(localThreads[1] <= clCxt->impl->maxWorkItemSizes[1]) &&
(localThreads[2] <= clCxt->impl->maxWorkItemSizes[2]) &&
((localThreads[0] * localThreads[1] * localThreads[2]) <= kernelWorkGroupSize) &&
(localThreads[0] * localThreads[1] * localThreads[2]) <= clCxt->impl->maxWorkGroupSize);
CV_Assert( localThreads[0] <= clCxt->impl->maxWorkItemSizes[0] );
CV_Assert( localThreads[1] <= clCxt->impl->maxWorkItemSizes[1] );
CV_Assert( localThreads[2] <= clCxt->impl->maxWorkItemSizes[2] );
CV_Assert( localThreads[0] * localThreads[1] * localThreads[2] <= kernelWorkGroupSize );
CV_Assert( localThreads[0] * localThreads[1] * localThreads[2] <= clCxt->impl->maxWorkGroupSize );
}
#ifdef PRINT_KERNEL_RUN_TIME