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

fix gpu::DeviceInfo compilation under linux

Browse Source 
glibc defines major and minor macros
which conflict with  gpu::DeviceInfo methods with the same name
This commit is contained in:
Vladislav Vinogradov
2013-06-21 13:53:56 +04:00
parent eff6dccb3b
commit 98bd401534
12 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/include/opencv2/core/gpu.hpp
View File

@@ -529,10 +529,10 @@ public:
size_t totalConstMem() const;
//! major compute capability
int major() const;
int majorVersion() const;
//! minor compute capability
int minor() const;
int minorVersion() const;
//! alignment requirement for textures
size_t textureAlignment() const;

2
modules/core/include/opencv2/core/gpu.inl.hpp
View File

@@ -619,7 +619,7 @@ size_t DeviceInfo::totalMemory() const
inline
bool DeviceInfo::supports(FeatureSet feature_set) const
{
int version = major() * 10 + minor();
int version = majorVersion() * 10 + minorVersion();
return version >= feature_set;
}