mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-03 08:19:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13331 from dbudniko:dbudniko/gapi_gpu_to_ocl_renaming_patch

Browse Source
This commit is contained in:
Alexander Alekhin 2018-11-29 15:39:14 +00:00
commit 197285d12a
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gapi/include/opencv2/gapi/gpu/ggpukernel.hpp
View File

@ -14,15 +14,5 @@
#include "opencv2/gapi/ocl/goclkernel.hpp" #include "opencv2/gapi/ocl/goclkernel.hpp"
#define GAPI_GPU_KERNEL GAPI_OCL_KERNEL #define GAPI_GPU_KERNEL GAPI_OCL_KERNEL
namespace cv {
namespace gapi {
namespace core {
namespace gpu {
using namespace ocl;
} // namespace gpu
} // namespace core
} // namespace gapi
} // namespace cv
#endif // OPENCV_GAPI_GGPUKERNEL_HPP #endif // OPENCV_GAPI_GGPUKERNEL_HPP

7
modules/gapi/include/opencv2/gapi/ocl/core.hpp
View File

@ -14,14 +14,11 @@
namespace cv { namespace cv {
namespace gapi { namespace gapi {
namespace core { namespace core {
inline namespace ocl { namespace ocl {
GAPI_EXPORTS GKernelPackage kernels(); GAPI_EXPORTS GKernelPackage kernels();
} // inline namespace ocl } // namespace ocl
namespace gpu {
using namespace ocl;
} // namespace gpu
} // namespace core } // namespace core
} // namespace gapi } // namespace gapi
} // namespace cv } // namespace cv

7
modules/gapi/include/opencv2/gapi/ocl/imgproc.hpp
View File

@ -14,14 +14,11 @@
namespace cv { namespace cv {
namespace gapi { namespace gapi {
namespace imgproc { namespace imgproc {
inline namespace ocl { namespace ocl {
GAPI_EXPORTS GKernelPackage kernels(); GAPI_EXPORTS GKernelPackage kernels();
} // inline namespace ocl } // namespace ocl
namespace gpu {
using namespace ocl;
} // namespace gpu
} // namespace imgproc } // namespace imgproc
} // namespace gapi } // namespace gapi
} // namespace cv } // namespace cv