Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
076eeffd
Commit
076eeffd
authored
Oct 08, 2013
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ocl: fix CL_RUNTIME_EXPORT for master branch
parent
f07769e9
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
9 deletions
+8
-9
cl_runtime.cpp
modules/ocl/src/cl_runtime/cl_runtime.cpp
+0
-7
match_template.cpp
modules/ocl/src/match_template.cpp
+1
-1
precomp.hpp
modules/ocl/src/precomp.hpp
+7
-1
No files found.
modules/ocl/src/cl_runtime/cl_runtime.cpp
View file @
076eeffd
...
...
@@ -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__)
...
...
modules/ocl/src/match_template.cpp
View file @
076eeffd
...
...
@@ -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
;
}
...
...
modules/ocl/src/precomp.hpp
View file @
076eeffd
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment