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

Merge pull request #2218 from alalek:fix_defects_code_coverity

Browse Source
This commit is contained in:
Andrey Pavlenko
2014-01-31 19:23:01 +04:00
committed by OpenCV Buildbot
parent 6925dbd9f9 6fa49f6e80
commit 25d2ab8a68
6 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3691,6 +3691,7 @@ struct PlatformInfo2::Impl
{
Impl(void* id)
{
refcount = 1;
handle = *(cl_platform_id*)id;
getDevices(devices, handle);
}
@@ -3724,6 +3725,26 @@ PlatformInfo2::~PlatformInfo2()
p->release();
}
PlatformInfo2::PlatformInfo2(const PlatformInfo2& i)
{
if (i.p)
i.p->addref();
this->p = i.p;
}
PlatformInfo2& PlatformInfo2::operator =(const PlatformInfo2& i)
{
if (i.p != this->p)
{
if (i.p)
i.p->addref();
if (this->p)
this->p->release();
this->p = i.p;
}
return *this;
}
int PlatformInfo2::deviceNumber() const
{
return p ? (int)p->devices.size() : 0;
@@ -3731,7 +3752,7 @@ int PlatformInfo2::deviceNumber() const
void PlatformInfo2::getDevice(Device& device, int d) const
{
CV_Assert(d < (int)p->devices.size() );
CV_Assert(p && d < (int)p->devices.size() );
if(p)
device.set(p->devices[d]);
}