patch removes gpu mention from ocl backend

diff --git a/modules/gapi/include/opencv2/gapi/gpu/ggpukernel.hpp b/modules/gapi/include/opencv2/gapi/gpu/ggpukernel.hpp
index 74926c0..f41cf13 100644 (file)
--- a/modules/gapi/include/opencv2/gapi/gpu/ggpukernel.hpp
+++ b/modules/gapi/include/opencv2/gapi/gpu/ggpukernel.hpp
@@ -14,15 +14,5 @@
 #include "opencv2/gapi/ocl/goclkernel.hpp"
 #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

diff --git a/modules/gapi/include/opencv2/gapi/ocl/core.hpp b/modules/gapi/include/opencv2/gapi/ocl/core.hpp
index 473ed3f..4ab85e2 100644 (file)
--- a/modules/gapi/include/opencv2/gapi/ocl/core.hpp
+++ b/modules/gapi/include/opencv2/gapi/ocl/core.hpp
@@ -14,14 +14,11 @@
 namespace cv {
 namespace gapi {
 namespace core {
-inline namespace ocl {
+namespace ocl {
 
         GAPI_EXPORTS GKernelPackage kernels();
 
-} // inline namespace ocl
-namespace gpu {
-    using namespace ocl;
-} // namespace gpu
+} // namespace ocl
 } // namespace core
 } // namespace gapi
 } // namespace cv

diff --git a/modules/gapi/include/opencv2/gapi/ocl/imgproc.hpp b/modules/gapi/include/opencv2/gapi/ocl/imgproc.hpp
index e36520a..1bb5911 100644 (file)
--- a/modules/gapi/include/opencv2/gapi/ocl/imgproc.hpp
+++ b/modules/gapi/include/opencv2/gapi/ocl/imgproc.hpp
@@ -14,14 +14,11 @@
 namespace cv {
 namespace gapi {
 namespace imgproc {
-inline namespace ocl {
+namespace ocl {
 
     GAPI_EXPORTS GKernelPackage kernels();
 
-} // inline namespace ocl
-namespace gpu {
-    using namespace ocl;
-} // namespace gpu
+} // namespace ocl
 } // namespace imgproc
 } // namespace gapi
 } // namespace cv