potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge pull request #18622 from TolyaTalamanov:at/fix-namespace

Browse Source
This commit is contained in:
Alexander Alekhin
2020-10-22 17:43:23 +00:00
parent ea1e3fb90d 49d5960a32
commit bd40952097
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gapi/include/opencv2/gapi/cpu/gcpukernel.hpp
+3 -3
View File
@@ -443,7 +443,7 @@ struct OCVStCallHelper<Impl, std::tuple<Ins...>, std::tuple<Outs...>> :
template<class Impl, class K> template<class Impl, class K>
class GCPUKernelImpl: public cv::detail::KernelTag class GCPUKernelImpl: public cv::detail::KernelTag
{ {
using CallHelper = detail::OCVCallHelper<Impl, typename K::InArgs, typename K::OutArgs>; using CallHelper = cv::detail::OCVCallHelper<Impl, typename K::InArgs, typename K::OutArgs>;
public: public:
using API = K; using API = K;
@@ -497,7 +497,7 @@ private:
template<typename K, typename Callable> template<typename K, typename Callable>
gapi::cpu::GOCVFunctor gapi::cpu::ocv_kernel(Callable& c) gapi::cpu::GOCVFunctor gapi::cpu::ocv_kernel(Callable& c)
{ {
using P = detail::OCVCallHelper<Callable, typename K::InArgs, typename K::OutArgs>; using P = cv::detail::OCVCallHelper<Callable, typename K::InArgs, typename K::OutArgs>;
return GOCVFunctor{ K::id() return GOCVFunctor{ K::id()
, &K::getOutMeta , &K::getOutMeta
, std::bind(&P::callFunctor, std::placeholders::_1, std::ref(c)) , std::bind(&P::callFunctor, std::placeholders::_1, std::ref(c))
@@ -507,7 +507,7 @@ gapi::cpu::GOCVFunctor gapi::cpu::ocv_kernel(Callable& c)
template<typename K, typename Callable> template<typename K, typename Callable>
gapi::cpu::GOCVFunctor gapi::cpu::ocv_kernel(const Callable& c) gapi::cpu::GOCVFunctor gapi::cpu::ocv_kernel(const Callable& c)
{ {
using P = detail::OCVCallHelper<Callable, typename K::InArgs, typename K::OutArgs>; using P = cv::detail::OCVCallHelper<Callable, typename K::InArgs, typename K::OutArgs>;
return GOCVFunctor{ K::id() return GOCVFunctor{ K::id()
, &K::getOutMeta , &K::getOutMeta
, std::bind(&P::callFunctor, std::placeholders::_1, c) , std::bind(&P::callFunctor, std::placeholders::_1, c)