Merge pull request #1036 from jet47:fix-gpu-deviceinfo

2013-06-27 15:37:42 +04:00
parent c1f8d9e3d2 98bd401534
commit 4f19216e45
12 changed files with 29 additions and 29 deletions
--- a/modules/core/include/opencv2/core/gpu.hpp
+++ b/modules/core/include/opencv2/core/gpu.hpp
@@ -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;
--- a/modules/core/include/opencv2/core/gpu.inl.hpp
+++ b/modules/core/include/opencv2/core/gpu.inl.hpp
@@ -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;
 }