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

do not open libopencl by dlopen if HAVE_OPENCL is not set

Browse Source
This commit is contained in:
jiakai 2015-12-21 12:04:00 +08:00
parent b4432c4fd7
commit 387214a3c5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/core/src/ocl.cpp
View File

@ -685,9 +685,12 @@ typedef struct _cl_buffer_region {
#define CL_CALLBACK CV_STDCALL
static volatile bool g_haveOpenCL = false;
static const char* oclFuncToCheck = "clEnqueueReadBufferRect";
#if defined(__APPLE__)
#ifdef HAVE_OPENCL
static const char* oclFuncToCheck = "clEnqueueReadBufferRect";
#endif
#if defined(__APPLE__) && defined(HAVE_OPENCL)
#include <dlfcn.h>
static void* initOpenCLAndLoad(const char* funcname)
@ -716,7 +719,7 @@ static void* initOpenCLAndLoad(const char* funcname)
return funcname && handle ? dlsym(handle, funcname) : 0;
}
#elif defined WIN32 || defined _WIN32
#elif (defined WIN32 || defined _WIN32) && defined(HAVE_OPENCL)
#ifndef _WIN32_WINNT // This is needed for the declaration of TryEnterCriticalSection in winbase.h with Visual Studio 2005 (and older?)
#define _WIN32_WINNT 0x0400 // http://msdn.microsoft.com/en-us/library/ms686857(VS.85).aspx
@ -751,7 +754,7 @@ static void* initOpenCLAndLoad(const char* funcname)
return funcname ? (void*)GetProcAddress(handle, funcname) : 0;
}
#elif defined(__linux)
#elif defined(__linux) && defined(HAVE_OPENCL)
#include <dlfcn.h>
#include <stdio.h>