Merge pull request #9799 from alalek:ocl_program

44699c59 · Vadim Pisarevsky · fee87ea3 · 6be25727 · 44699c59 · 44699c59
Commit 44699c59 authored Oct 09, 2017 by Vadim Pisarevsky
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

ocl.hpp modules/core/include/opencv2/core/ocl.hpp +5 -2

ocl.cpp modules/core/src/ocl.cpp +0 -0

No files found.
--- a/modules/core/include/opencv2/core/ocl.hpp
+++ b/modules/core/include/opencv2/core/ocl.hpp
@@ -613,8 +613,10 @@ public:
    String getPrefix() const;
    static String getPrefix(const String& buildflags);

-protected:
+
    struct Impl;
+    inline Impl* getImpl() const { return (Impl*)p; }
+protected:
    Impl* p;
 };

@@ -635,8 +637,9 @@ public:
    const String& source() const;
    hash_t hash() const; // deprecated

-protected:
    struct Impl;
+    inline Impl* getImpl() const { return (Impl*)p; }
+protected:
    Impl* p;
 };


--- a/modules/core/src/ocl.cpp
+++ b/modules/core/src/ocl.cpp