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

ocl: fix CL_RUNTIME_EXPORT for master branch

Browse Source
This commit is contained in:
Alexander Alekhin 2013-10-08 19:13:10 +04:00
parent f07769e9d8
commit 076eeffd4d
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/ocl/src/cl_runtime/cl_runtime.cpp
View File

@ -2,13 +2,6 @@
#if defined(HAVE_OPENCL) && (!defined(__APPLE__) || defined(IOS)) #if defined(HAVE_OPENCL) && (!defined(__APPLE__) || defined(IOS))
#if defined(BUILD_SHARED_LIBS) && (defined WIN32 || defined _WIN32 || defined WINCE)
#define CL_RUNTIME_EXPORT __declspec(dllexport)
#else
#define CL_RUNTIME_EXPORT
#endif
#include "opencv2/ocl/cl_runtime/cl_runtime.hpp" #include "opencv2/ocl/cl_runtime/cl_runtime.hpp"
#if defined(__APPLE__) #if defined(__APPLE__)

2
modules/ocl/src/match_template.cpp
View File

@ -91,7 +91,7 @@ namespace cv
static bool useNaive(int method, int depth, Size size) static bool useNaive(int method, int depth, Size size)
{ {
#ifdef HAVE_CLAMDFFT #ifdef HAVE_CLAMDFFT
if (method == TM_SQDIFF && (depth == CV_32F || !Context::getContext()->supportsFeature(Context::CL_DOUBLE))) if (method == TM_SQDIFF && (depth == CV_32F || !Context::getContext()->supportsFeature(FEATURE_CL_DOUBLE)))
{ {
return true; return true;
} }

8
modules/ocl/src/precomp.hpp
View File

@ -58,8 +58,14 @@
#include "cvconfig.h" #include "cvconfig.h"
#if defined(BUILD_SHARED_LIBS) && (defined WIN32 || defined _WIN32 || defined WINCE) #if defined(BUILD_SHARED_LIBS)
#if defined WIN32 || defined _WIN32 || defined WINCE
#define CL_RUNTIME_EXPORT __declspec(dllexport) #define CL_RUNTIME_EXPORT __declspec(dllexport)
#elif defined __GNUC__ && __GNUC__ >= 4
#define CL_RUNTIME_EXPORT __attribute__ ((visibility ("default")))
#else
#define CL_RUNTIME_EXPORT
#endif
#else #else
#define CL_RUNTIME_EXPORT #define CL_RUNTIME_EXPORT
#endif #endif