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

fixes

Browse Source
This commit is contained in:
Konstantin Matskevich
2014-01-24 14:01:31 +04:00
parent f90e41d54e
commit ae827a638c
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,7 @@ class CV_EXPORTS Kernel;
class CV_EXPORTS Program;
class CV_EXPORTS ProgramSource2;
class CV_EXPORTS Queue;
class CV_EXPORTS PlatformInform;
class CV_EXPORTS PlatformInfo2;
class CV_EXPORTS Device
{
@@ -551,12 +551,12 @@ protected:
Impl* p;
};
class CV_EXPORTS PlatformInform
class CV_EXPORTS PlatformInfo2
{
public:
PlatformInform();
explicit PlatformInform(void* id);
~PlatformInform();
PlatformInfo2();
explicit PlatformInfo2(void* id);
~PlatformInfo2();
String name() const;
String vendor() const;
@@ -572,7 +572,7 @@ protected:
CV_EXPORTS const char* convertTypeStr(int sdepth, int ddepth, int cn, char* buf);
CV_EXPORTS const char* typeToStr(int t);
CV_EXPORTS const char* memopTypeToStr(int t);
CV_EXPORTS void getPlatfomsInfo(std::vector<PlatformInform>& platform_info);
CV_EXPORTS void getPlatfomsInfo(std::vector<PlatformInfo2>& platform_info);
}}

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

@@ -3640,7 +3640,7 @@ static void getDevices(std::vector<cl_device_id>& devices,cl_platform_id& platfo
devices.resize(numDevices);
}
struct PlatformInform::Impl
struct PlatformInfo2::Impl
{
Impl(void* id)
{
@@ -3661,45 +3661,45 @@ struct PlatformInform::Impl
cl_platform_id handle;
};
PlatformInform::PlatformInform()
PlatformInfo2::PlatformInfo2()
{
p = 0;
}
PlatformInform::PlatformInform(void* platform_id)
PlatformInfo2::PlatformInfo2(void* platform_id)
{
p = new Impl(platform_id);
}
PlatformInform::~PlatformInform()
PlatformInfo2::~PlatformInfo2()
{
if(p)
p->release();
}
int PlatformInform::deviceNumber() const
int PlatformInfo2::deviceNumber() const
{
return p ? (int)p->devices.size() : 0;
}
void PlatformInform::getDevice(Device& device, int d) const
void PlatformInfo2::getDevice(Device& device, int d) const
{
CV_Assert(d < (int)p->devices.size() );
if(p)
device.set(p->devices[d]);
}
String PlatformInform::name() const
String PlatformInfo2::name() const
{
return p ? p->getStrProp(CL_PLATFORM_NAME) : String();
}
String PlatformInform::vendor() const
String PlatformInfo2::vendor() const
{
return p ? p->getStrProp(CL_PLATFORM_VENDOR) : String();
}
String PlatformInform::version() const
String PlatformInfo2::version() const
{
return p ? p->getStrProp(CL_PLATFORM_VERSION) : String();
}
@@ -3718,13 +3718,13 @@ static void getPlatforms(std::vector<cl_platform_id>& platforms)
platforms.resize(numPlatforms);
}
void getPlatfomsInfo(std::vector<PlatformInform>& platformsInfo)
void getPlatfomsInfo(std::vector<PlatformInfo2>& platformsInfo)
{
std::vector<cl_platform_id> platforms;
getPlatforms(platforms);
for (size_t i = 0; i < platforms.size(); i++)
{
platformsInfo.push_back( PlatformInform((void*)&platforms[i]) );
platformsInfo.push_back( PlatformInfo2((void*)&platforms[i]) );
}
}