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

fixed some more compile bugs (including Python bindings)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2013-10-22 23:34:16 +04:00
parent d3076c5014
commit de521fc9fa
6 changed files with 100 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/include/opencv2/core/mat.hpp
View File

@@ -346,6 +346,7 @@ struct CV_EXPORTS UMatData
int flags;
void* handle;
void* userdata;
};

4
modules/core/src/matrix.cpp
View File

@@ -80,8 +80,10 @@ public:
void deallocate(UMatData* u) const
{
if(u)
{
fastFree(u->origdata);
delete u;
delete u;
}
}
void map(UMatData*, int) const

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

@@ -1394,6 +1394,15 @@ struct Device::Impl
sz == sizeof(temp) ? _TpOut(temp) : _TpOut();
}
bool getBoolProp(cl_device_info prop) const
{
cl_bool temp = CL_FALSE;
size_t sz = 0;
return clGetDeviceInfo(handle, prop, sizeof(temp), &temp, &sz) >= 0 &&
sz == sizeof(temp) ? temp != 0 : false;
}
String getStrProp(cl_device_info prop) const
{
char buf[1024];
@@ -1479,13 +1488,13 @@ int Device::addressBits() const
{ return p ? p->getProp<cl_uint, int>(CL_DEVICE_ADDRESS_BITS) : 0; }
bool Device::available() const
{ return p ? p->getProp<cl_bool, bool>(CL_DEVICE_AVAILABLE) : 0; }
{ return p ? p->getBoolProp(CL_DEVICE_AVAILABLE) : false; }
bool Device::compilerAvailable() const
{ return p ? p->getProp<cl_bool, bool>(CL_DEVICE_COMPILER_AVAILABLE) : 0; }
{ return p ? p->getBoolProp(CL_DEVICE_COMPILER_AVAILABLE) : false; }
bool Device::linkerAvailable() const
{ return p ? p->getProp<cl_bool, bool>(CL_DEVICE_LINKER_AVAILABLE) : 0; }
{ return p ? p->getBoolProp(CL_DEVICE_LINKER_AVAILABLE) : false; }
int Device::doubleFPConfig() const
{ return p ? p->getProp<cl_device_fp_config, int>(CL_DEVICE_DOUBLE_FP_CONFIG) : 0; }
@@ -1497,10 +1506,10 @@ int Device::halfFPConfig() const
{ return p ? p->getProp<cl_device_fp_config, int>(CL_DEVICE_HALF_FP_CONFIG) : 0; }
bool Device::endianLittle() const
{ return p ? p->getProp<cl_bool, bool>(CL_DEVICE_ENDIAN_LITTLE) : 0; }
{ return p ? p->getBoolProp(CL_DEVICE_ENDIAN_LITTLE) : false; }
bool Device::errorCorrectionSupport() const
{ return p ? p->getProp<cl_bool, bool>(CL_DEVICE_ERROR_CORRECTION_SUPPORT) : 0; }
{ return p ? p->getBoolProp(CL_DEVICE_ERROR_CORRECTION_SUPPORT) : false; }
int Device::executionCapabilities() const
{ return p ? p->getProp<cl_device_exec_capabilities, int>(CL_DEVICE_EXECUTION_CAPABILITIES) : 0; }
@@ -1524,10 +1533,10 @@ int Device::localMemType() const
{ return p ? p->getProp<cl_device_local_mem_type, int>(CL_DEVICE_LOCAL_MEM_TYPE) : 0; }
bool Device::hostUnifiedMemory() const
{ return p ? p->getProp<cl_bool, bool>(CL_DEVICE_HOST_UNIFIED_MEMORY) : 0; }
{ return p ? p->getBoolProp(CL_DEVICE_HOST_UNIFIED_MEMORY) : false; }
bool Device::imageSupport() const
{ return p ? p->getProp<cl_bool, bool>(CL_DEVICE_IMAGE_SUPPORT) : 0; }
{ return p ? p->getBoolProp(CL_DEVICE_IMAGE_SUPPORT) : false; }
size_t Device::image2DMaxWidth() const
{ return p ? p->getProp<size_t, size_t>(CL_DEVICE_IMAGE2D_MAX_WIDTH) : 0; }

3
modules/core/src/umatrix.cpp
View File

@@ -58,6 +58,7 @@ UMatData::UMatData(const MatAllocator* allocator)
size = 0;
flags = 0;
handle = 0;
userdata = 0;
}
void UMatData::lock()
@@ -554,7 +555,7 @@ Mat UMat::getMat(int accessFlags) const
return hdr;
}
void* UMat::handle(int accessFlags) const
void* UMat::handle(int /*accessFlags*/) const
{
if( !u )
return 0;