ocl: fix CL_RUNTIME_EXPORT for master branch

diff --git a/modules/ocl/src/cl_runtime/cl_runtime.cpp b/modules/ocl/src/cl_runtime/cl_runtime.cpp
index c237afe..6752467 100644 (file)
--- a/modules/ocl/src/cl_runtime/cl_runtime.cpp
+++ b/modules/ocl/src/cl_runtime/cl_runtime.cpp
@@ -2,13 +2,6 @@
 
 #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"
 
 #if defined(__APPLE__)

diff --git a/modules/ocl/src/match_template.cpp b/modules/ocl/src/match_template.cpp
index cbcd6b3..9720c74 100644 (file)
--- a/modules/ocl/src/match_template.cpp
+++ b/modules/ocl/src/match_template.cpp
@@ -91,7 +91,7 @@ namespace cv
         static bool useNaive(int method, int depth, Size size)
         {
 #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;
             }

diff --git a/modules/ocl/src/precomp.hpp b/modules/ocl/src/precomp.hpp
index 140dcdb..b7ef58b 100644 (file)
--- a/modules/ocl/src/precomp.hpp
+++ b/modules/ocl/src/precomp.hpp
@@ -58,8 +58,14 @@
 
 #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)
+#elif defined __GNUC__ && __GNUC__ >= 4
+#define CL_RUNTIME_EXPORT __attribute__ ((visibility ("default")))
+#else
+#define CL_RUNTIME_EXPORT
+#endif
 #else
 #define CL_RUNTIME_EXPORT
 #endif