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

Merge pull request #2252 from ilya-lavrenov:ocl_ref

Browse Source
This commit is contained in:
Andrey Pavlenko
2014-02-04 16:34:27 +04:00
committed by OpenCV Buildbot
parent 49db511882 da5b316b4e
commit bd6620fa87
6 changed files with 272 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/core/include/opencv2/core/ocl.hpp
View File

@@ -90,7 +90,8 @@ public:
String vendor() const;
String OpenCL_C_Version() const;
String OpenCLVersion() const;
String deviceVersion() const;
int deviceVersionMajor() const;
int deviceVersionMinor() const;
String driverVersion() const;
void* ptr() const;
@@ -224,16 +225,12 @@ public:
static Context2& getDefault(bool initialize = true);
void* ptr() const;
struct Impl;
inline struct Impl* _getImpl() const { return p; }
friend void initializeContextFromHandle(Context2& ctx, void* platform, void* context, void* device);
protected:
struct Impl;
Impl* p;
};
// TODO Move to internal header
void initializeContextFromHandle(Context2& ctx, void* platform, void* context, void* device);
class CV_EXPORTS Platform
{
public:
@@ -245,12 +242,14 @@ public:
void* ptr() const;
static Platform& getDefault();
struct Impl;
inline struct Impl* _getImpl() const { return p; }
friend void initializeContextFromHandle(Context2& ctx, void* platform, void* context, void* device);
protected:
struct Impl;
Impl* p;
};
// TODO Move to internal header
void initializeContextFromHandle(Context2& ctx, void* platform, void* context, void* device);
class CV_EXPORTS Queue
{
@@ -585,9 +584,12 @@ class CV_EXPORTS Image2D
{
public:
Image2D();
Image2D(const UMat &src);
explicit Image2D(const UMat &src);
Image2D(const Image2D & i);
~Image2D();
Image2D & operator = (const Image2D & i);
void* ptr() const;
protected:
struct Impl;