From 3df83dce7e8e0af37bcdd997045cc3b97ba2fe05 Mon Sep 17 00:00:00 2001 From: Ruslan Garnov Date: Fri, 14 Jun 2019 19:27:19 +0300 Subject: [PATCH] Merge pull request #14741 from rgarnov:gapi_fix_includes Changed quotes to brackets when including public includes (#14741) --- modules/gapi/include/opencv2/gapi.hpp | 14 +++++------ modules/gapi/include/opencv2/gapi/core.hpp | 6 ++--- .../gapi/include/opencv2/gapi/cpu/core.hpp | 2 +- .../opencv2/gapi/fluid/gfluidbuffer.hpp | 6 ++--- modules/gapi/include/opencv2/gapi/garg.hpp | 18 +++++++------- modules/gapi/include/opencv2/gapi/garray.hpp | 2 +- modules/gapi/include/opencv2/gapi/gcall.hpp | 8 +++---- modules/gapi/include/opencv2/gapi/gcommon.hpp | 6 ++--- .../gapi/include/opencv2/gapi/gcompiled.hpp | 6 ++--- .../include/opencv2/gapi/gcompiled_async.hpp | 2 +- .../include/opencv2/gapi/gcomputation.hpp | 10 ++++---- .../opencv2/gapi/gcomputation_async.hpp | 4 ++-- modules/gapi/include/opencv2/gapi/gmat.hpp | 6 ++--- .../gapi/include/opencv2/gapi/gmetaarg.hpp | 10 ++++---- modules/gapi/include/opencv2/gapi/gproto.hpp | 12 +++++----- .../gapi/include/opencv2/gapi/gpu/core.hpp | 4 ++-- .../include/opencv2/gapi/gpu/ggpukernel.hpp | 4 ++-- .../gapi/include/opencv2/gapi/gpu/imgproc.hpp | 4 ++-- modules/gapi/include/opencv2/gapi/gscalar.hpp | 2 +- modules/gapi/include/opencv2/gapi/gtyped.hpp | 8 +++---- modules/gapi/include/opencv2/gapi/imgproc.hpp | 8 +++---- .../gapi/include/opencv2/gapi/operators.hpp | 4 ++-- .../gapi/include/opencv2/gapi/own/assert.hpp | 2 +- .../gapi/include/opencv2/gapi/own/convert.hpp | 2 +- modules/gapi/include/opencv2/gapi/own/mat.hpp | 12 +++++----- .../gapi/include/opencv2/gapi/util/any.hpp | 2 +- .../include/opencv2/gapi/util/optional.hpp | 2 +- .../include/opencv2/gapi/util/variant.hpp | 4 ++-- .../gapi/perf/common/gapi_core_perf_tests.hpp | 2 +- .../perf/common/gapi_imgproc_perf_tests.hpp | 2 +- .../perf/cpu/gapi_core_perf_tests_cpu.cpp | 2 +- .../perf/cpu/gapi_imgproc_perf_tests_cpu.cpp | 3 +-- modules/gapi/perf/perf_precomp.hpp | 22 ++++++++--------- modules/gapi/src/api/garray.cpp | 2 +- modules/gapi/src/api/gbackend.cpp | 4 ++-- modules/gapi/src/api/gcall.cpp | 2 +- modules/gapi/src/api/gcomputation.cpp | 4 ++-- modules/gapi/src/api/gkernel.cpp | 2 +- modules/gapi/src/api/gmat.cpp | 2 +- modules/gapi/src/api/gorigin.hpp | 8 +++---- modules/gapi/src/api/gproto.cpp | 6 ++--- modules/gapi/src/api/gscalar.cpp | 4 ++-- modules/gapi/src/api/kernels_core.cpp | 8 +++---- modules/gapi/src/api/kernels_imgproc.cpp | 8 +++---- modules/gapi/src/api/operators.cpp | 8 +++---- .../src/backends/common/gcompoundbackend.cpp | 2 +- .../src/backends/common/gcompoundkernel.cpp | 2 +- modules/gapi/src/backends/cpu/gcpubackend.cpp | 10 ++++---- modules/gapi/src/backends/cpu/gcpubackend.hpp | 6 ++--- modules/gapi/src/backends/cpu/gcpucore.cpp | 6 ++--- modules/gapi/src/backends/cpu/gcpuimgproc.cpp | 6 ++--- modules/gapi/src/backends/cpu/gcpukernel.cpp | 2 +- .../gapi/src/backends/fluid/gfluidbackend.cpp | 6 ++--- .../gapi/src/backends/fluid/gfluidbackend.hpp | 8 +++---- .../gapi/src/backends/fluid/gfluidbuffer.cpp | 8 +++---- .../gapi/src/backends/fluid/gfluidcore.cpp | 16 ++++++------- .../gapi/src/backends/fluid/gfluidimgproc.cpp | 22 ++++++++--------- .../fluid/gfluidimgproc_func.dispatch.cpp | 4 ++-- .../src/backends/fluid/gfluidimgproc_func.hpp | 2 +- modules/gapi/src/backends/ocl/goclbackend.cpp | 6 ++--- modules/gapi/src/backends/ocl/goclbackend.hpp | 6 ++--- modules/gapi/src/backends/ocl/goclcore.cpp | 4 ++-- modules/gapi/src/backends/ocl/goclcore.hpp | 2 +- modules/gapi/src/backends/ocl/goclimgproc.cpp | 4 ++-- modules/gapi/src/backends/ocl/goclimgproc.hpp | 2 +- modules/gapi/src/backends/ocl/goclkernel.cpp | 2 +- modules/gapi/src/compiler/gcompiled.cpp | 4 ++-- modules/gapi/src/compiler/gcompiler.cpp | 6 ++--- modules/gapi/src/compiler/gcompiler.hpp | 6 ++--- modules/gapi/src/compiler/gislandmodel.hpp | 4 ++-- modules/gapi/src/compiler/gmodel.cpp | 2 +- modules/gapi/src/compiler/gmodel.hpp | 4 ++-- modules/gapi/src/compiler/gmodelbuilder.hpp | 4 ++-- modules/gapi/src/compiler/passes/dump_dot.cpp | 2 +- modules/gapi/src/compiler/passes/exec.cpp | 2 +- modules/gapi/src/compiler/passes/helpers.cpp | 2 +- modules/gapi/src/compiler/passes/kernels.cpp | 2 +- modules/gapi/src/executor/gasync.cpp | 8 +++---- modules/gapi/src/executor/gexecutor.cpp | 2 +- modules/gapi/src/precomp.hpp | 12 +++++----- .../test/common/gapi_compoundkernel_tests.cpp | 2 +- .../gapi/test/common/gapi_core_tests_inl.hpp | 2 +- .../test/common/gapi_imgproc_tests_inl.hpp | 2 +- .../gapi/test/common/gapi_tests_common.hpp | 4 ++-- modules/gapi/test/cpu/gapi_core_tests_cpu.cpp | 2 +- .../gapi/test/cpu/gapi_imgproc_tests_cpu.cpp | 2 +- .../test/cpu/gapi_operators_tests_cpu.cpp | 2 +- modules/gapi/test/gapi_async_test.cpp | 4 ++-- modules/gapi/test/gapi_basic_hetero_tests.cpp | 2 +- modules/gapi/test/gapi_desc_tests.cpp | 2 +- modules/gapi/test/gapi_fluid_test.cpp | 6 ++--- modules/gapi/test/gapi_fluid_test_kernels.hpp | 2 +- modules/gapi/test/gapi_gcomputation_tests.cpp | 2 +- modules/gapi/test/gapi_gpu_test.cpp | 2 +- modules/gapi/test/gapi_kernel_tests.cpp | 6 ++--- modules/gapi/test/gapi_mock_kernels.hpp | 2 +- modules/gapi/test/gapi_util_tests.cpp | 2 +- .../internal/gapi_int_gmodel_builder_test.cpp | 2 +- .../internal/gapi_int_recompilation_test.cpp | 6 ++--- .../gapi/test/opencl_kernels_test_gapi.hpp | 6 ++--- modules/gapi/test/own/gapi_types_tests.cpp | 2 +- modules/gapi/test/own/mat_tests.cpp | 2 +- modules/gapi/test/own/scalar_tests.cpp | 2 +- modules/gapi/test/test_precomp.hpp | 24 +++++++++---------- modules/gapi/test/util/any_tests.cpp | 2 +- modules/gapi/test/util/optional_tests.cpp | 2 +- modules/gapi/test/util/variant_tests.cpp | 2 +- 107 files changed, 270 insertions(+), 271 deletions(-) diff --git a/modules/gapi/include/opencv2/gapi.hpp b/modules/gapi/include/opencv2/gapi.hpp index a043a83fc1..0600e2496b 100644 --- a/modules/gapi/include/opencv2/gapi.hpp +++ b/modules/gapi/include/opencv2/gapi.hpp @@ -22,12 +22,12 @@ @} */ -#include "opencv2/gapi/gmat.hpp" -#include "opencv2/gapi/garray.hpp" -#include "opencv2/gapi/gcomputation.hpp" -#include "opencv2/gapi/gcompiled.hpp" -#include "opencv2/gapi/gtyped.hpp" -#include "opencv2/gapi/gkernel.hpp" -#include "opencv2/gapi/operators.hpp" +#include +#include +#include +#include +#include +#include +#include #endif // OPENCV_GAPI_HPP diff --git a/modules/gapi/include/opencv2/gapi/core.hpp b/modules/gapi/include/opencv2/gapi/core.hpp index ac4d37f2b4..b9e0521036 100644 --- a/modules/gapi/include/opencv2/gapi/core.hpp +++ b/modules/gapi/include/opencv2/gapi/core.hpp @@ -12,9 +12,9 @@ #include -#include "opencv2/gapi/gmat.hpp" -#include "opencv2/gapi/gscalar.hpp" -#include "opencv2/gapi/gkernel.hpp" +#include +#include +#include /** \defgroup gapi_core G-API core (basic) functionality @{ diff --git a/modules/gapi/include/opencv2/gapi/cpu/core.hpp b/modules/gapi/include/opencv2/gapi/cpu/core.hpp index ec76fe5d5a..ffd3596f5a 100644 --- a/modules/gapi/include/opencv2/gapi/cpu/core.hpp +++ b/modules/gapi/include/opencv2/gapi/cpu/core.hpp @@ -9,7 +9,7 @@ #define OPENCV_GAPI_CPU_CORE_API_HPP #include // GKernelPackage -#include "opencv2/gapi/own/exports.hpp" // GAPI_EXPORTS +#include // GAPI_EXPORTS namespace cv { namespace gapi { diff --git a/modules/gapi/include/opencv2/gapi/fluid/gfluidbuffer.hpp b/modules/gapi/include/opencv2/gapi/fluid/gfluidbuffer.hpp index 8a723128bf..a5dd4a6f89 100644 --- a/modules/gapi/include/opencv2/gapi/fluid/gfluidbuffer.hpp +++ b/modules/gapi/include/opencv2/gapi/fluid/gfluidbuffer.hpp @@ -17,9 +17,9 @@ #include #include -#include "opencv2/gapi/util/optional.hpp" -#include "opencv2/gapi/own/scalar.hpp" -#include "opencv2/gapi/own/mat.hpp" +#include +#include +#include namespace cv { namespace gapi { diff --git a/modules/gapi/include/opencv2/gapi/garg.hpp b/modules/gapi/include/opencv2/gapi/garg.hpp index f8a3170068..8f912aadd9 100644 --- a/modules/gapi/include/opencv2/gapi/garg.hpp +++ b/modules/gapi/include/opencv2/gapi/garg.hpp @@ -12,17 +12,17 @@ #include #include -#include "opencv2/gapi/own/mat.hpp" +#include -#include "opencv2/gapi/util/any.hpp" -#include "opencv2/gapi/util/variant.hpp" +#include +#include -#include "opencv2/gapi/gmat.hpp" -#include "opencv2/gapi/gscalar.hpp" -#include "opencv2/gapi/garray.hpp" -#include "opencv2/gapi/gtype_traits.hpp" -#include "opencv2/gapi/gmetaarg.hpp" -#include "opencv2/gapi/own/scalar.hpp" +#include +#include +#include +#include +#include +#include namespace cv { diff --git a/modules/gapi/include/opencv2/gapi/garray.hpp b/modules/gapi/include/opencv2/gapi/garray.hpp index 87d00155b2..e818f0ad32 100644 --- a/modules/gapi/include/opencv2/gapi/garray.hpp +++ b/modules/gapi/include/opencv2/gapi/garray.hpp @@ -18,7 +18,7 @@ #include #include -#include "opencv2/gapi/own/assert.hpp" +#include namespace cv { diff --git a/modules/gapi/include/opencv2/gapi/gcall.hpp b/modules/gapi/include/opencv2/gapi/gcall.hpp index 50223ce248..87cba52971 100644 --- a/modules/gapi/include/opencv2/gapi/gcall.hpp +++ b/modules/gapi/include/opencv2/gapi/gcall.hpp @@ -8,10 +8,10 @@ #ifndef OPENCV_GAPI_GCALL_HPP #define OPENCV_GAPI_GCALL_HPP -#include "opencv2/gapi/garg.hpp" // GArg -#include "opencv2/gapi/gmat.hpp" // GMat -#include "opencv2/gapi/gscalar.hpp" // GScalar -#include "opencv2/gapi/garray.hpp" // GArray +#include // GArg +#include // GMat +#include // GScalar +#include // GArray namespace cv { diff --git a/modules/gapi/include/opencv2/gapi/gcommon.hpp b/modules/gapi/include/opencv2/gapi/gcommon.hpp index 6a3f51f779..e97e10e922 100644 --- a/modules/gapi/include/opencv2/gapi/gcommon.hpp +++ b/modules/gapi/include/opencv2/gapi/gcommon.hpp @@ -14,9 +14,9 @@ #include -#include "opencv2/gapi/util/any.hpp" -#include "opencv2/gapi/own/exports.hpp" -#include "opencv2/gapi/own/assert.hpp" +#include +#include +#include namespace cv { diff --git a/modules/gapi/include/opencv2/gapi/gcompiled.hpp b/modules/gapi/include/opencv2/gapi/gcompiled.hpp index ad491b7337..c825edf1a7 100644 --- a/modules/gapi/include/opencv2/gapi/gcompiled.hpp +++ b/modules/gapi/include/opencv2/gapi/gcompiled.hpp @@ -10,9 +10,9 @@ #include -#include "opencv2/gapi/opencv_includes.hpp" -#include "opencv2/gapi/own/assert.hpp" -#include "opencv2/gapi/garg.hpp" +#include +#include +#include namespace cv { diff --git a/modules/gapi/include/opencv2/gapi/gcompiled_async.hpp b/modules/gapi/include/opencv2/gapi/gcompiled_async.hpp index a9d946bee1..924380d979 100644 --- a/modules/gapi/include/opencv2/gapi/gcompiled_async.hpp +++ b/modules/gapi/include/opencv2/gapi/gcompiled_async.hpp @@ -11,7 +11,7 @@ #include //for std::future #include //for std::exception_ptr #include //for std::function -#include "opencv2/gapi/garg.hpp" +#include namespace cv { //fwd declaration diff --git a/modules/gapi/include/opencv2/gapi/gcomputation.hpp b/modules/gapi/include/opencv2/gapi/gcomputation.hpp index 9a6febc118..fdeef86da5 100644 --- a/modules/gapi/include/opencv2/gapi/gcomputation.hpp +++ b/modules/gapi/include/opencv2/gapi/gcomputation.hpp @@ -10,11 +10,11 @@ #include -#include "opencv2/gapi/util/util.hpp" -#include "opencv2/gapi/gcommon.hpp" -#include "opencv2/gapi/gproto.hpp" -#include "opencv2/gapi/garg.hpp" -#include "opencv2/gapi/gcompiled.hpp" +#include +#include +#include +#include +#include namespace cv { diff --git a/modules/gapi/include/opencv2/gapi/gcomputation_async.hpp b/modules/gapi/include/opencv2/gapi/gcomputation_async.hpp index f2a6d8d519..1f76dd0aa8 100644 --- a/modules/gapi/include/opencv2/gapi/gcomputation_async.hpp +++ b/modules/gapi/include/opencv2/gapi/gcomputation_async.hpp @@ -11,8 +11,8 @@ #include #include //for std::exception_ptr #include //for std::function -#include "opencv2/gapi/garg.hpp" //for GRunArgs, GRunArgsP -#include "opencv2/gapi/gcommon.hpp" //for GCompileArgs +#include //for GRunArgs, GRunArgsP +#include //for GCompileArgs namespace cv { //fwd declaration diff --git a/modules/gapi/include/opencv2/gapi/gmat.hpp b/modules/gapi/include/opencv2/gapi/gmat.hpp index f0ce26b415..d6b6e7261f 100644 --- a/modules/gapi/include/opencv2/gapi/gmat.hpp +++ b/modules/gapi/include/opencv2/gapi/gmat.hpp @@ -14,9 +14,9 @@ #include #include // GShape -#include "opencv2/gapi/own/types.hpp" // cv::gapi::own::Size -#include "opencv2/gapi/own/convert.hpp" // to_own -#include "opencv2/gapi/own/assert.hpp" +#include // cv::gapi::own::Size +#include // to_own +#include // TODO GAPI_EXPORTS or so namespace cv diff --git a/modules/gapi/include/opencv2/gapi/gmetaarg.hpp b/modules/gapi/include/opencv2/gapi/gmetaarg.hpp index abdea752eb..5b6e2adfd8 100644 --- a/modules/gapi/include/opencv2/gapi/gmetaarg.hpp +++ b/modules/gapi/include/opencv2/gapi/gmetaarg.hpp @@ -11,12 +11,12 @@ #include #include -#include "opencv2/gapi/util/util.hpp" -#include "opencv2/gapi/util/variant.hpp" +#include +#include -#include "opencv2/gapi/gmat.hpp" -#include "opencv2/gapi/gscalar.hpp" -#include "opencv2/gapi/garray.hpp" +#include +#include +#include namespace cv { diff --git a/modules/gapi/include/opencv2/gapi/gproto.hpp b/modules/gapi/include/opencv2/gapi/gproto.hpp index a3bce1a82a..b9e206ac9e 100644 --- a/modules/gapi/include/opencv2/gapi/gproto.hpp +++ b/modules/gapi/include/opencv2/gapi/gproto.hpp @@ -12,13 +12,13 @@ #include #include -#include "opencv2/gapi/util/variant.hpp" +#include -#include "opencv2/gapi/gmat.hpp" -#include "opencv2/gapi/gscalar.hpp" -#include "opencv2/gapi/garray.hpp" -#include "opencv2/gapi/garg.hpp" -#include "opencv2/gapi/gmetaarg.hpp" +#include +#include +#include +#include +#include namespace cv { diff --git a/modules/gapi/include/opencv2/gapi/gpu/core.hpp b/modules/gapi/include/opencv2/gapi/gpu/core.hpp index f780545dfc..a7ee59577c 100644 --- a/modules/gapi/include/opencv2/gapi/gpu/core.hpp +++ b/modules/gapi/include/opencv2/gapi/gpu/core.hpp @@ -8,10 +8,10 @@ #ifndef OPENCV_GAPI_GPU_CORE_API_HPP #define OPENCV_GAPI_GPU_CORE_API_HPP /** @file -* @deprecated Use "opencv2/gapi/ocl/core.hpp" instead. +* @deprecated Use instead. */ -#include "opencv2/gapi/ocl/core.hpp" +#include namespace cv { namespace gapi { diff --git a/modules/gapi/include/opencv2/gapi/gpu/ggpukernel.hpp b/modules/gapi/include/opencv2/gapi/gpu/ggpukernel.hpp index f41cf133f7..b52c21de6b 100644 --- a/modules/gapi/include/opencv2/gapi/gpu/ggpukernel.hpp +++ b/modules/gapi/include/opencv2/gapi/gpu/ggpukernel.hpp @@ -8,10 +8,10 @@ #ifndef OPENCV_GAPI_GGPUKERNEL_HPP #define OPENCV_GAPI_GGPUKERNEL_HPP /** @file -* @deprecated Use "opencv2/gapi/ocl/goclkernel.hpp" instead. +* @deprecated Use instead. */ -#include "opencv2/gapi/ocl/goclkernel.hpp" +#include #define GAPI_GPU_KERNEL GAPI_OCL_KERNEL diff --git a/modules/gapi/include/opencv2/gapi/gpu/imgproc.hpp b/modules/gapi/include/opencv2/gapi/gpu/imgproc.hpp index 81ae0cb761..b0df7ae331 100644 --- a/modules/gapi/include/opencv2/gapi/gpu/imgproc.hpp +++ b/modules/gapi/include/opencv2/gapi/gpu/imgproc.hpp @@ -8,10 +8,10 @@ #ifndef OPENCV_GAPI_GPU_IMGPROC_API_HPP #define OPENCV_GAPI_GPU_IMGPROC_API_HPP /** @file -* @deprecated Use "opencv2/gapi/ocl/imgproc.hpp" instead. +* @deprecated Use instead. */ -#include "opencv2/gapi/ocl/imgproc.hpp" +#include namespace cv { diff --git a/modules/gapi/include/opencv2/gapi/gscalar.hpp b/modules/gapi/include/opencv2/gapi/gscalar.hpp index dd1205b638..f65741e61d 100644 --- a/modules/gapi/include/opencv2/gapi/gscalar.hpp +++ b/modules/gapi/include/opencv2/gapi/gscalar.hpp @@ -14,7 +14,7 @@ #include #include // GShape #include -#include "opencv2/gapi/own/scalar.hpp" +#include namespace cv { diff --git a/modules/gapi/include/opencv2/gapi/gtyped.hpp b/modules/gapi/include/opencv2/gapi/gtyped.hpp index a966f263fc..8e48e91bd3 100644 --- a/modules/gapi/include/opencv2/gapi/gtyped.hpp +++ b/modules/gapi/include/opencv2/gapi/gtyped.hpp @@ -11,10 +11,10 @@ #include -#include "opencv2/gapi/gcomputation.hpp" -#include "opencv2/gapi/gcompiled.hpp" -#include "opencv2/gapi/gproto.hpp" -#include "opencv2/gapi/gcommon.hpp" +#include +#include +#include +#include namespace cv { diff --git a/modules/gapi/include/opencv2/gapi/imgproc.hpp b/modules/gapi/include/opencv2/gapi/imgproc.hpp index 0726d9c9ce..1538bcde57 100644 --- a/modules/gapi/include/opencv2/gapi/imgproc.hpp +++ b/modules/gapi/include/opencv2/gapi/imgproc.hpp @@ -8,13 +8,13 @@ #ifndef OPENCV_GAPI_IMGPROC_HPP #define OPENCV_GAPI_IMGPROC_HPP -#include "opencv2/imgproc.hpp" +#include #include // std::tuple -#include "opencv2/gapi/gkernel.hpp" -#include "opencv2/gapi/gmat.hpp" -#include "opencv2/gapi/gscalar.hpp" +#include +#include +#include /** \defgroup gapi_imgproc G-API image processing functionality diff --git a/modules/gapi/include/opencv2/gapi/operators.hpp b/modules/gapi/include/opencv2/gapi/operators.hpp index 27a1d8012a..b20062cfd5 100644 --- a/modules/gapi/include/opencv2/gapi/operators.hpp +++ b/modules/gapi/include/opencv2/gapi/operators.hpp @@ -8,8 +8,8 @@ #ifndef OPENCV_GAPI_OPERATORS_HPP #define OPENCV_GAPI_OPERATORS_HPP -#include "opencv2/gapi/gmat.hpp" -#include "opencv2/gapi/gscalar.hpp" +#include +#include GAPI_EXPORTS cv::GMat operator+(const cv::GMat& lhs, const cv::GMat& rhs); diff --git a/modules/gapi/include/opencv2/gapi/own/assert.hpp b/modules/gapi/include/opencv2/gapi/own/assert.hpp index 10ec240b51..92b246ff6d 100644 --- a/modules/gapi/include/opencv2/gapi/own/assert.hpp +++ b/modules/gapi/include/opencv2/gapi/own/assert.hpp @@ -16,7 +16,7 @@ #else #include #include -#include "opencv2/gapi/util/throw.hpp" +#include namespace detail { diff --git a/modules/gapi/include/opencv2/gapi/own/convert.hpp b/modules/gapi/include/opencv2/gapi/own/convert.hpp index 8c1feb408b..4a7394a11d 100644 --- a/modules/gapi/include/opencv2/gapi/own/convert.hpp +++ b/modules/gapi/include/opencv2/gapi/own/convert.hpp @@ -13,7 +13,7 @@ #include #include #include -#include "opencv2/gapi/own/scalar.hpp" +#include namespace cv { diff --git a/modules/gapi/include/opencv2/gapi/own/mat.hpp b/modules/gapi/include/opencv2/gapi/own/mat.hpp index 73f3afcbcd..20f5b55d82 100644 --- a/modules/gapi/include/opencv2/gapi/own/mat.hpp +++ b/modules/gapi/include/opencv2/gapi/own/mat.hpp @@ -8,15 +8,15 @@ #ifndef OPENCV_GAPI_OWN_MAT_HPP #define OPENCV_GAPI_OWN_MAT_HPP -#include "opencv2/gapi/opencv_includes.hpp" -#include "opencv2/gapi/own/types.hpp" -#include "opencv2/gapi/own/scalar.hpp" -#include "opencv2/gapi/own/saturate.hpp" -#include "opencv2/gapi/own/assert.hpp" +#include +#include +#include +#include +#include #include //std::shared_ptr #include //std::memcpy -#include "opencv2/gapi/util/throw.hpp" +#include namespace cv { namespace gapi { namespace own { namespace detail { diff --git a/modules/gapi/include/opencv2/gapi/util/any.hpp b/modules/gapi/include/opencv2/gapi/util/any.hpp index 3146cb6fdc..5f97e95b08 100644 --- a/modules/gapi/include/opencv2/gapi/util/any.hpp +++ b/modules/gapi/include/opencv2/gapi/util/any.hpp @@ -13,7 +13,7 @@ #include #include -#include "opencv2/gapi/util/throw.hpp" +#include #if defined(_MSC_VER) // disable MSVC warning on "multiple copy constructors specified" diff --git a/modules/gapi/include/opencv2/gapi/util/optional.hpp b/modules/gapi/include/opencv2/gapi/util/optional.hpp index 54126d6271..1aa2b265d9 100644 --- a/modules/gapi/include/opencv2/gapi/util/optional.hpp +++ b/modules/gapi/include/opencv2/gapi/util/optional.hpp @@ -8,7 +8,7 @@ #ifndef OPENCV_GAPI_UTIL_OPTIONAL_HPP #define OPENCV_GAPI_UTIL_OPTIONAL_HPP -#include "opencv2/gapi/util/variant.hpp" +#include // A poor man's `optional` implementation, incompletely modeled against C++17 spec. namespace cv diff --git a/modules/gapi/include/opencv2/gapi/util/variant.hpp b/modules/gapi/include/opencv2/gapi/util/variant.hpp index a7e43c5569..134ba66234 100644 --- a/modules/gapi/include/opencv2/gapi/util/variant.hpp +++ b/modules/gapi/include/opencv2/gapi/util/variant.hpp @@ -11,8 +11,8 @@ #include #include -#include "opencv2/gapi/util/throw.hpp" -#include "opencv2/gapi/util/util.hpp" // max_of_t +#include +#include // max_of_t // A poor man's `variant` implementation, incompletely modeled against C++17 spec. namespace cv diff --git a/modules/gapi/perf/common/gapi_core_perf_tests.hpp b/modules/gapi/perf/common/gapi_core_perf_tests.hpp index 8b743f0b23..25b5615ce9 100644 --- a/modules/gapi/perf/common/gapi_core_perf_tests.hpp +++ b/modules/gapi/perf/common/gapi_core_perf_tests.hpp @@ -10,7 +10,7 @@ #include "../../test/common/gapi_tests_common.hpp" -#include "opencv2/gapi/core.hpp" +#include namespace opencv_test { diff --git a/modules/gapi/perf/common/gapi_imgproc_perf_tests.hpp b/modules/gapi/perf/common/gapi_imgproc_perf_tests.hpp index 8cec2674c8..c4e5bc64ae 100644 --- a/modules/gapi/perf/common/gapi_imgproc_perf_tests.hpp +++ b/modules/gapi/perf/common/gapi_imgproc_perf_tests.hpp @@ -11,7 +11,7 @@ #include "../../test/common/gapi_tests_common.hpp" -#include "opencv2/gapi/imgproc.hpp" +#include namespace opencv_test { diff --git a/modules/gapi/perf/cpu/gapi_core_perf_tests_cpu.cpp b/modules/gapi/perf/cpu/gapi_core_perf_tests_cpu.cpp index 82fabfdfdd..4a681f941a 100644 --- a/modules/gapi/perf/cpu/gapi_core_perf_tests_cpu.cpp +++ b/modules/gapi/perf/cpu/gapi_core_perf_tests_cpu.cpp @@ -7,7 +7,7 @@ #include "../perf_precomp.hpp" #include "../common/gapi_core_perf_tests.hpp" -#include "opencv2/gapi/cpu/core.hpp" +#include #define CORE_CPU cv::gapi::core::cpu::kernels() diff --git a/modules/gapi/perf/cpu/gapi_imgproc_perf_tests_cpu.cpp b/modules/gapi/perf/cpu/gapi_imgproc_perf_tests_cpu.cpp index d8ca241dfb..b2e5b3d1b7 100644 --- a/modules/gapi/perf/cpu/gapi_imgproc_perf_tests_cpu.cpp +++ b/modules/gapi/perf/cpu/gapi_imgproc_perf_tests_cpu.cpp @@ -7,8 +7,7 @@ #include "../perf_precomp.hpp" #include "../common/gapi_imgproc_perf_tests.hpp" -#include "opencv2/gapi/cpu/imgproc.hpp" - +#include #define IMGPROC_CPU cv::gapi::imgproc::cpu::kernels() diff --git a/modules/gapi/perf/perf_precomp.hpp b/modules/gapi/perf/perf_precomp.hpp index 4f9466e335..bf1953284b 100644 --- a/modules/gapi/perf/perf_precomp.hpp +++ b/modules/gapi/perf/perf_precomp.hpp @@ -11,17 +11,17 @@ #include #include -#include "opencv2/ts.hpp" -#include "opencv2/gapi.hpp" -#include "opencv2/gapi/imgproc.hpp" -#include "opencv2/gapi/core.hpp" -#include "opencv2/gapi/cpu/gcpukernel.hpp" -#include "opencv2/gapi/gpu/ggpukernel.hpp" -#include "opencv2/gapi/gpu/imgproc.hpp" -#include "opencv2/gapi/gpu/core.hpp" -#include "opencv2/gapi/operators.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "opencv2/gapi/fluid/core.hpp" -#include "opencv2/gapi/fluid/imgproc.hpp" +#include +#include #endif // __OPENCV_GAPI_PERF_PRECOMP_HPP__ diff --git a/modules/gapi/src/api/garray.cpp b/modules/gapi/src/api/garray.cpp index 793f44a2b4..bdd46b973f 100644 --- a/modules/gapi/src/api/garray.cpp +++ b/modules/gapi/src/api/garray.cpp @@ -6,7 +6,7 @@ #include "precomp.hpp" -#include "opencv2/gapi/garray.hpp" +#include #include "api/gorigin.hpp" // cv::detail::GArrayU public implementation /////////////////////////////////// diff --git a/modules/gapi/src/api/gbackend.cpp b/modules/gapi/src/api/gbackend.cpp index 0eb3793858..6d4af8f6ad 100644 --- a/modules/gapi/src/api/gbackend.cpp +++ b/modules/gapi/src/api/gbackend.cpp @@ -8,8 +8,8 @@ #include "precomp.hpp" #include // unique_ptr -#include "opencv2/gapi/gkernel.hpp" -#include "opencv2/gapi/own/convert.hpp" +#include +#include #include "api/gbackend_priv.hpp" #include "backends/common/gbackend.hpp" diff --git a/modules/gapi/src/api/gcall.cpp b/modules/gapi/src/api/gcall.cpp index 51de047173..4c052ff3f0 100644 --- a/modules/gapi/src/api/gcall.cpp +++ b/modules/gapi/src/api/gcall.cpp @@ -7,7 +7,7 @@ #include "precomp.hpp" #include -#include "opencv2/gapi/gcall.hpp" +#include #include "api/gcall_priv.hpp" // GCall private implementation //////////////////////////////////////////////// diff --git a/modules/gapi/src/api/gcomputation.cpp b/modules/gapi/src/api/gcomputation.cpp index 1b19a3e2f2..64a449530b 100644 --- a/modules/gapi/src/api/gcomputation.cpp +++ b/modules/gapi/src/api/gcomputation.cpp @@ -12,8 +12,8 @@ #include "logger.hpp" // GAPI_LOG -#include "opencv2/gapi/gcomputation.hpp" -#include "opencv2/gapi/gkernel.hpp" +#include +#include #include "api/gcomputation_priv.hpp" #include "api/gcall_priv.hpp" diff --git a/modules/gapi/src/api/gkernel.cpp b/modules/gapi/src/api/gkernel.cpp index fb5dd615bd..ef682e80ae 100644 --- a/modules/gapi/src/api/gkernel.cpp +++ b/modules/gapi/src/api/gkernel.cpp @@ -13,7 +13,7 @@ #include #include "logger.hpp" -#include "opencv2/gapi/gkernel.hpp" +#include #include "api/gbackend_priv.hpp" diff --git a/modules/gapi/src/api/gmat.cpp b/modules/gapi/src/api/gmat.cpp index 1466a26540..5bc55ef2d9 100644 --- a/modules/gapi/src/api/gmat.cpp +++ b/modules/gapi/src/api/gmat.cpp @@ -8,8 +8,8 @@ #include "precomp.hpp" #include #include //gapi::own::Mat +#include -#include "opencv2/gapi/gmat.hpp" #include "api/gorigin.hpp" // cv::GMat public implementation ////////////////////////////////////////////// diff --git a/modules/gapi/src/api/gorigin.hpp b/modules/gapi/src/api/gorigin.hpp index ad4ebf534d..7129b2f766 100644 --- a/modules/gapi/src/api/gorigin.hpp +++ b/modules/gapi/src/api/gorigin.hpp @@ -11,11 +11,11 @@ #include // set #include // map -#include "opencv2/gapi/util/variant.hpp" // variant -#include "opencv2/gapi/gcommon.hpp" -#include "opencv2/gapi/opencv_includes.hpp" -#include "compiler/gobjref.hpp" +#include // variant +#include +#include +#include "compiler/gobjref.hpp" #include "api/gnode.hpp" namespace cv diff --git a/modules/gapi/src/api/gproto.cpp b/modules/gapi/src/api/gproto.cpp index af5ba56db6..1106af96da 100644 --- a/modules/gapi/src/api/gproto.cpp +++ b/modules/gapi/src/api/gproto.cpp @@ -8,9 +8,9 @@ #include "precomp.hpp" #include -#include "opencv2/gapi/util/throw.hpp" -#include "opencv2/gapi/garg.hpp" -#include "opencv2/gapi/gproto.hpp" +#include +#include +#include #include "api/gorigin.hpp" #include "api/gproto_priv.hpp" diff --git a/modules/gapi/src/api/gscalar.cpp b/modules/gapi/src/api/gscalar.cpp index 2e42ae6241..fa7c0cdda4 100644 --- a/modules/gapi/src/api/gscalar.cpp +++ b/modules/gapi/src/api/gscalar.cpp @@ -7,8 +7,8 @@ #include "precomp.hpp" -#include "opencv2/gapi/gscalar.hpp" -#include "opencv2/gapi/own/convert.hpp" +#include +#include #include "api/gorigin.hpp" // cv::GScalar public implementation /////////////////////////////////////////// diff --git a/modules/gapi/src/api/kernels_core.cpp b/modules/gapi/src/api/kernels_core.cpp index e46968b9d9..dfb9befe70 100644 --- a/modules/gapi/src/api/kernels_core.cpp +++ b/modules/gapi/src/api/kernels_core.cpp @@ -7,10 +7,10 @@ #include "precomp.hpp" -#include "opencv2/gapi/gcall.hpp" -#include "opencv2/gapi/gscalar.hpp" -#include "opencv2/gapi/gkernel.hpp" -#include "opencv2/gapi/core.hpp" +#include +#include +#include +#include #include #include diff --git a/modules/gapi/src/api/kernels_imgproc.cpp b/modules/gapi/src/api/kernels_imgproc.cpp index 919936d32c..171452bfe1 100644 --- a/modules/gapi/src/api/kernels_imgproc.cpp +++ b/modules/gapi/src/api/kernels_imgproc.cpp @@ -7,10 +7,10 @@ #include "precomp.hpp" -#include "opencv2/gapi/gscalar.hpp" -#include "opencv2/gapi/gcall.hpp" -#include "opencv2/gapi/gkernel.hpp" -#include "opencv2/gapi/imgproc.hpp" +#include +#include +#include +#include namespace cv { namespace gapi { diff --git a/modules/gapi/src/api/operators.cpp b/modules/gapi/src/api/operators.cpp index 44fc4fa527..6097c011d0 100644 --- a/modules/gapi/src/api/operators.cpp +++ b/modules/gapi/src/api/operators.cpp @@ -7,10 +7,10 @@ #include "precomp.hpp" -#include "opencv2/gapi/imgproc.hpp" -#include "opencv2/gapi/core.hpp" -#include "opencv2/gapi/gscalar.hpp" -#include "opencv2/gapi/operators.hpp" +#include +#include +#include +#include cv::GMat operator+(const cv::GMat& lhs, const cv::GMat& rhs) { diff --git a/modules/gapi/src/backends/common/gcompoundbackend.cpp b/modules/gapi/src/backends/common/gcompoundbackend.cpp index 948898f28d..894c49ec87 100644 --- a/modules/gapi/src/backends/common/gcompoundbackend.cpp +++ b/modules/gapi/src/backends/common/gcompoundbackend.cpp @@ -7,7 +7,7 @@ #include "precomp.hpp" -#include "opencv2/gapi/gcompoundkernel.hpp" // compound::backend() +#include // compound::backend() #include "api/gbackend_priv.hpp" #include "compiler/gislandmodel.hpp" // GIslandExecutable diff --git a/modules/gapi/src/backends/common/gcompoundkernel.cpp b/modules/gapi/src/backends/common/gcompoundkernel.cpp index 89abcef59d..05ed51dce9 100644 --- a/modules/gapi/src/backends/common/gcompoundkernel.cpp +++ b/modules/gapi/src/backends/common/gcompoundkernel.cpp @@ -8,7 +8,7 @@ #include "precomp.hpp" #include // util::indexed -#include "opencv2/gapi/gcompoundkernel.hpp" +#include #include "compiler/gobjref.hpp" // FIXME move to backends diff --git a/modules/gapi/src/backends/cpu/gcpubackend.cpp b/modules/gapi/src/backends/cpu/gcpubackend.cpp index 9da0641d2c..cfdb7ae030 100644 --- a/modules/gapi/src/backends/cpu/gcpubackend.cpp +++ b/modules/gapi/src/backends/cpu/gcpubackend.cpp @@ -18,16 +18,16 @@ #include -#include "opencv2/gapi/gcommon.hpp" -#include "opencv2/gapi/util/any.hpp" -#include "opencv2/gapi/gtype_traits.hpp" +#include +#include +#include #include "compiler/gobjref.hpp" #include "compiler/gmodel.hpp" #include "backends/cpu/gcpubackend.hpp" -#include "opencv2/gapi/cpu/imgproc.hpp" -#include "opencv2/gapi/cpu/core.hpp" +#include +#include #include "api/gbackend_priv.hpp" // FIXME: Make it part of Backend SDK! diff --git a/modules/gapi/src/backends/cpu/gcpubackend.hpp b/modules/gapi/src/backends/cpu/gcpubackend.hpp index 218cac1be0..923a05eb13 100644 --- a/modules/gapi/src/backends/cpu/gcpubackend.hpp +++ b/modules/gapi/src/backends/cpu/gcpubackend.hpp @@ -13,9 +13,9 @@ #include // tuple #include // type_list_index -#include "opencv2/gapi/garg.hpp" -#include "opencv2/gapi/gproto.hpp" -#include "opencv2/gapi/cpu/gcpukernel.hpp" +#include +#include +#include #include "api/gorigin.hpp" #include "backends/common/gbackend.hpp" diff --git a/modules/gapi/src/backends/cpu/gcpucore.cpp b/modules/gapi/src/backends/cpu/gcpucore.cpp index 542fdb1cab..a0706b0ef3 100644 --- a/modules/gapi/src/backends/cpu/gcpucore.cpp +++ b/modules/gapi/src/backends/cpu/gcpucore.cpp @@ -7,9 +7,9 @@ #include "precomp.hpp" -#include "opencv2/gapi/core.hpp" -#include "opencv2/gapi/cpu/core.hpp" -#include "opencv2/gapi/cpu/gcpukernel.hpp" +#include +#include +#include GAPI_OCV_KERNEL(GCPUAdd, cv::gapi::core::GAdd) { diff --git a/modules/gapi/src/backends/cpu/gcpuimgproc.cpp b/modules/gapi/src/backends/cpu/gcpuimgproc.cpp index 4f98907430..8acc773f83 100644 --- a/modules/gapi/src/backends/cpu/gcpuimgproc.cpp +++ b/modules/gapi/src/backends/cpu/gcpuimgproc.cpp @@ -7,9 +7,9 @@ #include "precomp.hpp" -#include "opencv2/gapi/imgproc.hpp" -#include "opencv2/gapi/cpu/imgproc.hpp" -#include "opencv2/gapi/cpu/gcpukernel.hpp" +#include +#include +#include #include "backends/fluid/gfluidimgproc_func.hpp" diff --git a/modules/gapi/src/backends/cpu/gcpukernel.cpp b/modules/gapi/src/backends/cpu/gcpukernel.cpp index af13eed6c2..5bc77aa583 100644 --- a/modules/gapi/src/backends/cpu/gcpukernel.cpp +++ b/modules/gapi/src/backends/cpu/gcpukernel.cpp @@ -9,7 +9,7 @@ #include -#include "opencv2/gapi/cpu/gcpukernel.hpp" +#include const cv::gapi::own::Mat& cv::GCPUContext::inMat(int input) { diff --git a/modules/gapi/src/backends/fluid/gfluidbackend.cpp b/modules/gapi/src/backends/fluid/gfluidbackend.cpp index eecfa6546d..cffd6e6d3d 100644 --- a/modules/gapi/src/backends/fluid/gfluidbackend.cpp +++ b/modules/gapi/src/backends/fluid/gfluidbackend.cpp @@ -22,11 +22,11 @@ #include #include -#include "opencv2/gapi/gcommon.hpp" +#include #include "logger.hpp" -#include "opencv2/gapi/own/convert.hpp" -#include "opencv2/gapi/gmat.hpp" //for version of descr_of +#include +#include //for version of descr_of // PRIVATE STUFF! #include "compiler/gobjref.hpp" #include "compiler/gmodel.hpp" diff --git a/modules/gapi/src/backends/fluid/gfluidbackend.hpp b/modules/gapi/src/backends/fluid/gfluidbackend.hpp index d540999783..64242cd215 100644 --- a/modules/gapi/src/backends/fluid/gfluidbackend.hpp +++ b/modules/gapi/src/backends/fluid/gfluidbackend.hpp @@ -10,10 +10,10 @@ // FIXME? Actually gfluidbackend.hpp is not included anywhere // and can be placed in gfluidbackend.cpp -#include "opencv2/gapi/garg.hpp" -#include "opencv2/gapi/gproto.hpp" -#include "opencv2/gapi/fluid/gfluidkernel.hpp" -#include "opencv2/gapi/fluid/gfluidbuffer.hpp" +#include +#include +#include +#include // PRIVATE STUFF! #include "backends/common/gbackend.hpp" diff --git a/modules/gapi/src/backends/fluid/gfluidbuffer.cpp b/modules/gapi/src/backends/fluid/gfluidbuffer.cpp index 0bfdd66349..f0dc6edb78 100644 --- a/modules/gapi/src/backends/fluid/gfluidbuffer.cpp +++ b/modules/gapi/src/backends/fluid/gfluidbuffer.cpp @@ -9,12 +9,12 @@ #include // hex, dec (debug) -#include "opencv2/gapi/own/convert.hpp" -#include "opencv2/gapi/own/types.hpp" +#include +#include -#include "opencv2/gapi/fluid/gfluidbuffer.hpp" +#include #include "backends/fluid/gfluidbuffer_priv.hpp" -#include "opencv2/gapi/opencv_includes.hpp" +#include #include "backends/fluid/gfluidutils.hpp" // saturate diff --git a/modules/gapi/src/backends/fluid/gfluidcore.cpp b/modules/gapi/src/backends/fluid/gfluidcore.cpp index b58ec0765c..49d6d2e233 100644 --- a/modules/gapi/src/backends/fluid/gfluidcore.cpp +++ b/modules/gapi/src/backends/fluid/gfluidcore.cpp @@ -8,16 +8,16 @@ #include "precomp.hpp" -#include "opencv2/gapi/own/assert.hpp" -#include "opencv2/core/traits.hpp" -#include "opencv2/core/hal/hal.hpp" -#include "opencv2/core/hal/intrin.hpp" +#include +#include +#include +#include -#include "opencv2/gapi/core.hpp" +#include -#include "opencv2/gapi/fluid/gfluidbuffer.hpp" -#include "opencv2/gapi/fluid/gfluidkernel.hpp" -#include "opencv2/gapi/fluid/core.hpp" +#include +#include +#include #include "gfluidbuffer_priv.hpp" #include "gfluidbackend.hpp" diff --git a/modules/gapi/src/backends/fluid/gfluidimgproc.cpp b/modules/gapi/src/backends/fluid/gfluidimgproc.cpp index 98449dd113..dfbce1e9fc 100644 --- a/modules/gapi/src/backends/fluid/gfluidimgproc.cpp +++ b/modules/gapi/src/backends/fluid/gfluidimgproc.cpp @@ -8,18 +8,18 @@ #include "precomp.hpp" -#include "opencv2/gapi/own/assert.hpp" -#include "opencv2/core/traits.hpp" -#include "opencv2/imgproc/types_c.h" +#include +#include +#include -#include "opencv2/gapi/core.hpp" -#include "opencv2/gapi/imgproc.hpp" +#include +#include -#include "opencv2/gapi/own/types.hpp" +#include -#include "opencv2/gapi/fluid/gfluidbuffer.hpp" -#include "opencv2/gapi/fluid/gfluidkernel.hpp" -#include "opencv2/gapi/fluid/imgproc.hpp" +#include +#include +#include #include "gfluidbuffer_priv.hpp" #include "gfluidbackend.hpp" @@ -27,8 +27,8 @@ #include "gfluidimgproc_func.hpp" -#include "opencv2/imgproc/hal/hal.hpp" -#include "opencv2/core/hal/intrin.hpp" +#include +#include #include #include diff --git a/modules/gapi/src/backends/fluid/gfluidimgproc_func.dispatch.cpp b/modules/gapi/src/backends/fluid/gfluidimgproc_func.dispatch.cpp index ad0ba9f13e..3ea4676dde 100644 --- a/modules/gapi/src/backends/fluid/gfluidimgproc_func.dispatch.cpp +++ b/modules/gapi/src/backends/fluid/gfluidimgproc_func.dispatch.cpp @@ -12,8 +12,8 @@ #include "gfluidutils.hpp" -#include "opencv2/core/cvdef.h" -#include "opencv2/core/hal/intrin.hpp" +#include +#include #include #include diff --git a/modules/gapi/src/backends/fluid/gfluidimgproc_func.hpp b/modules/gapi/src/backends/fluid/gfluidimgproc_func.hpp index cf908fe309..b89ccd8988 100644 --- a/modules/gapi/src/backends/fluid/gfluidimgproc_func.hpp +++ b/modules/gapi/src/backends/fluid/gfluidimgproc_func.hpp @@ -8,7 +8,7 @@ #if !defined(GAPI_STANDALONE) -#include "opencv2/core.hpp" +#include namespace cv { namespace gapi { diff --git a/modules/gapi/src/backends/ocl/goclbackend.cpp b/modules/gapi/src/backends/ocl/goclbackend.cpp index 6bfa74e35d..e5a6493ede 100644 --- a/modules/gapi/src/backends/ocl/goclbackend.cpp +++ b/modules/gapi/src/backends/ocl/goclbackend.cpp @@ -18,9 +18,9 @@ #include -#include "opencv2/gapi/gcommon.hpp" -#include "opencv2/gapi/util/any.hpp" -#include "opencv2/gapi/gtype_traits.hpp" +#include +#include +#include #include "compiler/gobjref.hpp" #include "compiler/gmodel.hpp" diff --git a/modules/gapi/src/backends/ocl/goclbackend.hpp b/modules/gapi/src/backends/ocl/goclbackend.hpp index b57c66209d..52cf6d2636 100644 --- a/modules/gapi/src/backends/ocl/goclbackend.hpp +++ b/modules/gapi/src/backends/ocl/goclbackend.hpp @@ -13,9 +13,9 @@ #include // tuple #include // type_list_index -#include "opencv2/gapi/garg.hpp" -#include "opencv2/gapi/gproto.hpp" -#include "opencv2/gapi/ocl/goclkernel.hpp" +#include +#include +#include #include "api/gorigin.hpp" #include "backends/common/gbackend.hpp" diff --git a/modules/gapi/src/backends/ocl/goclcore.cpp b/modules/gapi/src/backends/ocl/goclcore.cpp index f55f7bb2f9..9741100219 100644 --- a/modules/gapi/src/backends/ocl/goclcore.cpp +++ b/modules/gapi/src/backends/ocl/goclcore.cpp @@ -7,8 +7,8 @@ #include "precomp.hpp" -#include "opencv2/gapi/core.hpp" -#include "opencv2/gapi/ocl/core.hpp" +#include +#include #include "backends/ocl/goclcore.hpp" GAPI_OCL_KERNEL(GOCLAdd, cv::gapi::core::GAdd) diff --git a/modules/gapi/src/backends/ocl/goclcore.hpp b/modules/gapi/src/backends/ocl/goclcore.hpp index fb6b78ad12..1ed9c06fae 100644 --- a/modules/gapi/src/backends/ocl/goclcore.hpp +++ b/modules/gapi/src/backends/ocl/goclcore.hpp @@ -11,7 +11,7 @@ #include #include -#include "opencv2/gapi/ocl/goclkernel.hpp" +#include namespace cv { namespace gimpl { diff --git a/modules/gapi/src/backends/ocl/goclimgproc.cpp b/modules/gapi/src/backends/ocl/goclimgproc.cpp index 6e99d00d95..5795f44023 100644 --- a/modules/gapi/src/backends/ocl/goclimgproc.cpp +++ b/modules/gapi/src/backends/ocl/goclimgproc.cpp @@ -7,8 +7,8 @@ #include "precomp.hpp" -#include "opencv2/gapi/imgproc.hpp" -#include "opencv2/gapi/ocl/imgproc.hpp" +#include +#include #include "backends/ocl/goclimgproc.hpp" diff --git a/modules/gapi/src/backends/ocl/goclimgproc.hpp b/modules/gapi/src/backends/ocl/goclimgproc.hpp index 7bb18f0a76..864f5fef70 100644 --- a/modules/gapi/src/backends/ocl/goclimgproc.hpp +++ b/modules/gapi/src/backends/ocl/goclimgproc.hpp @@ -11,7 +11,7 @@ #include #include -#include "opencv2/gapi/ocl/goclkernel.hpp" +#include namespace cv { namespace gimpl { diff --git a/modules/gapi/src/backends/ocl/goclkernel.cpp b/modules/gapi/src/backends/ocl/goclkernel.cpp index d01aae8373..11ca51be45 100644 --- a/modules/gapi/src/backends/ocl/goclkernel.cpp +++ b/modules/gapi/src/backends/ocl/goclkernel.cpp @@ -7,7 +7,7 @@ #include -#include "opencv2/gapi/ocl/goclkernel.hpp" +#include const cv::UMat& cv::GOCLContext::inMat(int input) { diff --git a/modules/gapi/src/compiler/gcompiled.cpp b/modules/gapi/src/compiler/gcompiled.cpp index 00de6997ed..b277257513 100644 --- a/modules/gapi/src/compiler/gcompiled.cpp +++ b/modules/gapi/src/compiler/gcompiled.cpp @@ -9,8 +9,8 @@ #include -#include "opencv2/gapi/gproto.hpp" // can_describe -#include "opencv2/gapi/gcompiled.hpp" +#include // can_describe +#include #include "compiler/gcompiled_priv.hpp" #include "backends/common/gbackend.hpp" diff --git a/modules/gapi/src/compiler/gcompiler.cpp b/modules/gapi/src/compiler/gcompiler.cpp index 82e484daf3..9925c196ad 100644 --- a/modules/gapi/src/compiler/gcompiler.cpp +++ b/modules/gapi/src/compiler/gcompiler.cpp @@ -35,12 +35,12 @@ // #if !defined(GAPI_STANDALONE) -#include "opencv2/gapi/cpu/core.hpp" // Also directly refer to Core -#include "opencv2/gapi/cpu/imgproc.hpp" // ...and Imgproc kernel implementations +#include // Also directly refer to Core +#include // ...and Imgproc kernel implementations #endif // !defined(GAPI_STANDALONE) // -#include "opencv2/gapi/gcompoundkernel.hpp" // compound::backend() +#include // compound::backend() #include "logger.hpp" diff --git a/modules/gapi/src/compiler/gcompiler.hpp b/modules/gapi/src/compiler/gcompiler.hpp index b369c14d12..3848434059 100644 --- a/modules/gapi/src/compiler/gcompiler.hpp +++ b/modules/gapi/src/compiler/gcompiler.hpp @@ -9,9 +9,9 @@ #define OPENCV_GAPI_GCOMPILER_HPP -#include "opencv2/gapi/gcommon.hpp" -#include "opencv2/gapi/gkernel.hpp" -#include "opencv2/gapi/gcomputation.hpp" +#include +#include +#include #include diff --git a/modules/gapi/src/compiler/gislandmodel.hpp b/modules/gapi/src/compiler/gislandmodel.hpp index 03b42ff381..d25db58300 100644 --- a/modules/gapi/src/compiler/gislandmodel.hpp +++ b/modules/gapi/src/compiler/gislandmodel.hpp @@ -15,8 +15,8 @@ #include #include -#include "opencv2/gapi/util/optional.hpp" -#include "opencv2/gapi/gkernel.hpp" +#include +#include #include "compiler/gobjref.hpp" diff --git a/modules/gapi/src/compiler/gmodel.cpp b/modules/gapi/src/compiler/gmodel.cpp index 180a0fb2ff..ce7134745a 100644 --- a/modules/gapi/src/compiler/gmodel.cpp +++ b/modules/gapi/src/compiler/gmodel.cpp @@ -14,7 +14,7 @@ #include // util::indexed #include -#include "opencv2/gapi/gproto.hpp" +#include #include "api/gnode_priv.hpp" #include "compiler/gobjref.hpp" #include "compiler/gmodel.hpp" diff --git a/modules/gapi/src/compiler/gmodel.hpp b/modules/gapi/src/compiler/gmodel.hpp index 5e951c74bc..cf65c7382d 100644 --- a/modules/gapi/src/compiler/gmodel.hpp +++ b/modules/gapi/src/compiler/gmodel.hpp @@ -22,8 +22,8 @@ // This part of the system is API-unaware by its design. // -#include "opencv2/gapi/garg.hpp" -#include "opencv2/gapi/gkernel.hpp" +#include +#include #include "compiler/gobjref.hpp" #include "compiler/gislandmodel.hpp" diff --git a/modules/gapi/src/compiler/gmodelbuilder.hpp b/modules/gapi/src/compiler/gmodelbuilder.hpp index 2d06000617..abe1c79d38 100644 --- a/modules/gapi/src/compiler/gmodelbuilder.hpp +++ b/modules/gapi/src/compiler/gmodelbuilder.hpp @@ -11,8 +11,8 @@ #include #include -#include "opencv2/gapi/gproto.hpp" -#include "opencv2/gapi/gcall.hpp" +#include +#include #include "api/gorigin.hpp" #include "api/gnode.hpp" diff --git a/modules/gapi/src/compiler/passes/dump_dot.cpp b/modules/gapi/src/compiler/passes/dump_dot.cpp index 89020d19b5..1eefe723b8 100644 --- a/modules/gapi/src/compiler/passes/dump_dot.cpp +++ b/modules/gapi/src/compiler/passes/dump_dot.cpp @@ -14,7 +14,7 @@ #include -#include "opencv2/gapi/gproto.hpp" +#include #include "compiler/gmodel.hpp" #include "compiler/gislandmodel.hpp" #include "compiler/passes/passes.hpp" diff --git a/modules/gapi/src/compiler/passes/exec.cpp b/modules/gapi/src/compiler/passes/exec.cpp index 8b20d60eec..73743a4ad9 100644 --- a/modules/gapi/src/compiler/passes/exec.cpp +++ b/modules/gapi/src/compiler/passes/exec.cpp @@ -17,7 +17,7 @@ #include // contains #include // chain -#include "opencv2/gapi/util/optional.hpp" // util::optional +#include // util::optional #include "logger.hpp" // GAPI_LOG #include "compiler/gmodel.hpp" diff --git a/modules/gapi/src/compiler/passes/helpers.cpp b/modules/gapi/src/compiler/passes/helpers.cpp index 60bf36afdc..12267a38d1 100644 --- a/modules/gapi/src/compiler/passes/helpers.cpp +++ b/modules/gapi/src/compiler/passes/helpers.cpp @@ -13,7 +13,7 @@ #include -#include "opencv2/gapi/own/assert.hpp" // GAPI_Assert +#include // GAPI_Assert #include "compiler/passes/helpers.hpp" namespace { diff --git a/modules/gapi/src/compiler/passes/kernels.cpp b/modules/gapi/src/compiler/passes/kernels.cpp index 1d9eac69e1..e00deaab29 100644 --- a/modules/gapi/src/compiler/passes/kernels.cpp +++ b/modules/gapi/src/compiler/passes/kernels.cpp @@ -11,7 +11,7 @@ #include #include -#include "opencv2/gapi/gcompoundkernel.hpp" // compound::backend() +#include // compound::backend() #include "compiler/gmodel.hpp" #include "compiler/passes/passes.hpp" diff --git a/modules/gapi/src/executor/gasync.cpp b/modules/gapi/src/executor/gasync.cpp index eba09516d4..a66563b74f 100644 --- a/modules/gapi/src/executor/gasync.cpp +++ b/modules/gapi/src/executor/gasync.cpp @@ -4,10 +4,10 @@ // // Copyright (C) 2019 Intel Corporation -#include "opencv2/gapi/gcomputation_async.hpp" -#include "opencv2/gapi/gcomputation.hpp" -#include "opencv2/gapi/gcompiled_async.hpp" -#include "opencv2/gapi/gcompiled.hpp" +#include +#include +#include +#include #include diff --git a/modules/gapi/src/executor/gexecutor.cpp b/modules/gapi/src/executor/gexecutor.cpp index ede38e8e99..aacc4d1222 100644 --- a/modules/gapi/src/executor/gexecutor.cpp +++ b/modules/gapi/src/executor/gexecutor.cpp @@ -11,7 +11,7 @@ #include -#include "opencv2/gapi/opencv_includes.hpp" +#include #include "executor/gexecutor.hpp" #include "compiler/passes/passes.hpp" diff --git a/modules/gapi/src/precomp.hpp b/modules/gapi/src/precomp.hpp index eebe9d8968..6106cd9bce 100644 --- a/modules/gapi/src/precomp.hpp +++ b/modules/gapi/src/precomp.hpp @@ -9,13 +9,13 @@ #define __OPENCV_GAPI_PRECOMP_HPP__ #if !defined(GAPI_STANDALONE) -# include "opencv2/core.hpp" -# include "opencv2/imgproc.hpp" -# include "opencv2/gapi/core.hpp" -# include "opencv2/gapi/imgproc.hpp" +# include +# include +# include +# include #endif // !defined(GAPI_STANDALONE) -#include "opencv2/gapi.hpp" -#include "opencv2/gapi/gkernel.hpp" +#include +#include #endif // __OPENCV_GAPI_PRECOMP_HPP__ diff --git a/modules/gapi/test/common/gapi_compoundkernel_tests.cpp b/modules/gapi/test/common/gapi_compoundkernel_tests.cpp index e2b56a7d09..a0237599bc 100644 --- a/modules/gapi/test/common/gapi_compoundkernel_tests.cpp +++ b/modules/gapi/test/common/gapi_compoundkernel_tests.cpp @@ -8,7 +8,7 @@ // FIXME: move out from Common #include "../test_precomp.hpp" -#include "opencv2/gapi/cpu/core.hpp" +#include #include diff --git a/modules/gapi/test/common/gapi_core_tests_inl.hpp b/modules/gapi/test/common/gapi_core_tests_inl.hpp index 78c38659fd..3fe1153b94 100644 --- a/modules/gapi/test/common/gapi_core_tests_inl.hpp +++ b/modules/gapi/test/common/gapi_core_tests_inl.hpp @@ -8,7 +8,7 @@ #ifndef OPENCV_GAPI_CORE_TESTS_INL_HPP #define OPENCV_GAPI_CORE_TESTS_INL_HPP -#include "opencv2/gapi/core.hpp" +#include #include "gapi_core_tests.hpp" namespace opencv_test diff --git a/modules/gapi/test/common/gapi_imgproc_tests_inl.hpp b/modules/gapi/test/common/gapi_imgproc_tests_inl.hpp index 438dd0a8ec..e5d5154f23 100644 --- a/modules/gapi/test/common/gapi_imgproc_tests_inl.hpp +++ b/modules/gapi/test/common/gapi_imgproc_tests_inl.hpp @@ -8,7 +8,7 @@ #ifndef OPENCV_GAPI_IMGPROC_TESTS_INL_HPP #define OPENCV_GAPI_IMGPROC_TESTS_INL_HPP -#include "opencv2/gapi/imgproc.hpp" +#include #include "gapi_imgproc_tests.hpp" namespace opencv_test diff --git a/modules/gapi/test/common/gapi_tests_common.hpp b/modules/gapi/test/common/gapi_tests_common.hpp index 937587c0bd..35c4be3e47 100644 --- a/modules/gapi/test/common/gapi_tests_common.hpp +++ b/modules/gapi/test/common/gapi_tests_common.hpp @@ -7,8 +7,8 @@ #include -#include "opencv2/ts.hpp" -#include "opencv2/gapi.hpp" +#include +#include namespace { diff --git a/modules/gapi/test/cpu/gapi_core_tests_cpu.cpp b/modules/gapi/test/cpu/gapi_core_tests_cpu.cpp index dc5e856091..8b92179fc4 100644 --- a/modules/gapi/test/cpu/gapi_core_tests_cpu.cpp +++ b/modules/gapi/test/cpu/gapi_core_tests_cpu.cpp @@ -7,7 +7,7 @@ #include "../test_precomp.hpp" #include "../common/gapi_core_tests.hpp" -#include "opencv2/gapi/cpu/core.hpp" +#include #define CORE_CPU cv::gapi::core::cpu::kernels() diff --git a/modules/gapi/test/cpu/gapi_imgproc_tests_cpu.cpp b/modules/gapi/test/cpu/gapi_imgproc_tests_cpu.cpp index 60d012efeb..c6aca318db 100644 --- a/modules/gapi/test/cpu/gapi_imgproc_tests_cpu.cpp +++ b/modules/gapi/test/cpu/gapi_imgproc_tests_cpu.cpp @@ -8,7 +8,7 @@ #include "../test_precomp.hpp" #include "../common/gapi_imgproc_tests.hpp" -#include "opencv2/gapi/cpu/imgproc.hpp" +#include #define IMGPROC_CPU cv::gapi::imgproc::cpu::kernels() diff --git a/modules/gapi/test/cpu/gapi_operators_tests_cpu.cpp b/modules/gapi/test/cpu/gapi_operators_tests_cpu.cpp index 435c798c68..d19c338ee6 100644 --- a/modules/gapi/test/cpu/gapi_operators_tests_cpu.cpp +++ b/modules/gapi/test/cpu/gapi_operators_tests_cpu.cpp @@ -7,7 +7,7 @@ #include "../test_precomp.hpp" #include "../common/gapi_operators_tests.hpp" -#include "opencv2/gapi/cpu/core.hpp" +#include #define CORE_CPU cv::gapi::core::cpu::kernels() diff --git a/modules/gapi/test/gapi_async_test.cpp b/modules/gapi/test/gapi_async_test.cpp index ebf7a7d3e2..4ad4c597d0 100644 --- a/modules/gapi/test/gapi_async_test.cpp +++ b/modules/gapi/test/gapi_async_test.cpp @@ -6,8 +6,8 @@ #include "test_precomp.hpp" -#include "opencv2/gapi/gcomputation_async.hpp" -#include "opencv2/gapi/gcompiled_async.hpp" +#include +#include #include #include diff --git a/modules/gapi/test/gapi_basic_hetero_tests.cpp b/modules/gapi/test/gapi_basic_hetero_tests.cpp index 62069d8650..4f0ac18812 100644 --- a/modules/gapi/test/gapi_basic_hetero_tests.cpp +++ b/modules/gapi/test/gapi_basic_hetero_tests.cpp @@ -8,7 +8,7 @@ #include "test_precomp.hpp" #include "gapi_mock_kernels.hpp" -#include "opencv2/gapi/fluid/gfluidkernel.hpp" +#include namespace opencv_test { diff --git a/modules/gapi/test/gapi_desc_tests.cpp b/modules/gapi/test/gapi_desc_tests.cpp index d0c551ad3e..fa79230ff8 100644 --- a/modules/gapi/test/gapi_desc_tests.cpp +++ b/modules/gapi/test/gapi_desc_tests.cpp @@ -7,7 +7,7 @@ #include "test_precomp.hpp" -#include "opencv2/gapi/cpu/gcpukernel.hpp" +#include namespace opencv_test { diff --git a/modules/gapi/test/gapi_fluid_test.cpp b/modules/gapi/test/gapi_fluid_test.cpp index 131f96aaa0..b919d99114 100644 --- a/modules/gapi/test/gapi_fluid_test.cpp +++ b/modules/gapi/test/gapi_fluid_test.cpp @@ -7,10 +7,10 @@ #include "test_precomp.hpp" -#include "opencv2/gapi/core.hpp" +#include -#include "opencv2/gapi/fluid/gfluidbuffer.hpp" -#include "opencv2/gapi/fluid/gfluidkernel.hpp" +#include +#include // FIXME: move these tests with priv() to internal suite #include "backends/fluid/gfluidbuffer_priv.hpp" diff --git a/modules/gapi/test/gapi_fluid_test_kernels.hpp b/modules/gapi/test/gapi_fluid_test_kernels.hpp index 567dddd5d3..dfb88225bb 100644 --- a/modules/gapi/test/gapi_fluid_test_kernels.hpp +++ b/modules/gapi/test/gapi_fluid_test_kernels.hpp @@ -8,7 +8,7 @@ #ifndef GAPI_FLUID_TEST_KERNELS_HPP #define GAPI_FLUID_TEST_KERNELS_HPP -#include "opencv2/gapi/fluid/gfluidkernel.hpp" +#include namespace cv { diff --git a/modules/gapi/test/gapi_gcomputation_tests.cpp b/modules/gapi/test/gapi_gcomputation_tests.cpp index c00b30660c..0e38e05705 100644 --- a/modules/gapi/test/gapi_gcomputation_tests.cpp +++ b/modules/gapi/test/gapi_gcomputation_tests.cpp @@ -6,7 +6,7 @@ #include "test_precomp.hpp" -#include "opencv2/gapi/cpu/gcpukernel.hpp" +#include #include namespace opencv_test diff --git a/modules/gapi/test/gapi_gpu_test.cpp b/modules/gapi/test/gapi_gpu_test.cpp index 7cb6f9f66d..6c4e10a139 100644 --- a/modules/gapi/test/gapi_gpu_test.cpp +++ b/modules/gapi/test/gapi_gpu_test.cpp @@ -10,7 +10,7 @@ #include "logger.hpp" #include "common/gapi_tests_common.hpp" -#include "opencv2/gapi/gpu/ggpukernel.hpp" +#include #include "opencl_kernels_test_gapi.hpp" diff --git a/modules/gapi/test/gapi_kernel_tests.cpp b/modules/gapi/test/gapi_kernel_tests.cpp index bece077c0d..7a33b0de9e 100644 --- a/modules/gapi/test/gapi_kernel_tests.cpp +++ b/modules/gapi/test/gapi_kernel_tests.cpp @@ -6,11 +6,11 @@ #include "test_precomp.hpp" -#include "opencv2/gapi/cpu/gcpukernel.hpp" +#include #include "gapi_mock_kernels.hpp" -#include "opencv2/gapi/cpu/gcpukernel.hpp" // cpu::backend -#include "opencv2/gapi/fluid/gfluidkernel.hpp" // fluid::backend +#include // cpu::backend +#include // fluid::backend namespace opencv_test { diff --git a/modules/gapi/test/gapi_mock_kernels.hpp b/modules/gapi/test/gapi_mock_kernels.hpp index cd876efdbe..9163281d25 100644 --- a/modules/gapi/test/gapi_mock_kernels.hpp +++ b/modules/gapi/test/gapi_mock_kernels.hpp @@ -5,7 +5,7 @@ // Copyright (C) 2018 Intel Corporation -#include "opencv2/gapi/cpu/gcpukernel.hpp" +#include #include "api/gbackend_priv.hpp" // directly instantiate GBackend::Priv diff --git a/modules/gapi/test/gapi_util_tests.cpp b/modules/gapi/test/gapi_util_tests.cpp index 574c0ab542..e080f544f9 100644 --- a/modules/gapi/test/gapi_util_tests.cpp +++ b/modules/gapi/test/gapi_util_tests.cpp @@ -9,7 +9,7 @@ #include -#include "opencv2/gapi/util/util.hpp" +#include namespace opencv_test { diff --git a/modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp b/modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp index f5de114863..e166b87a7a 100644 --- a/modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp +++ b/modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp @@ -9,7 +9,7 @@ #include // util::indexed -#include "opencv2/gapi/gkernel.hpp" +#include #include "compiler/gmodelbuilder.hpp" #include "compiler/gmodel.hpp" // RcDesc, GModel::init diff --git a/modules/gapi/test/internal/gapi_int_recompilation_test.cpp b/modules/gapi/test/internal/gapi_int_recompilation_test.cpp index 25c8e3dee5..c433025aa1 100644 --- a/modules/gapi/test/internal/gapi_int_recompilation_test.cpp +++ b/modules/gapi/test/internal/gapi_int_recompilation_test.cpp @@ -8,9 +8,9 @@ #include "../test_precomp.hpp" #include "api/gcomputation_priv.hpp" -#include "opencv2/gapi/fluid/gfluidkernel.hpp" -#include "opencv2/gapi/fluid/core.hpp" -#include "opencv2/gapi/fluid/imgproc.hpp" +#include +#include +#include namespace opencv_test { diff --git a/modules/gapi/test/opencl_kernels_test_gapi.hpp b/modules/gapi/test/opencl_kernels_test_gapi.hpp index 1164165c4b..e71985f6e3 100644 --- a/modules/gapi/test/opencl_kernels_test_gapi.hpp +++ b/modules/gapi/test/opencl_kernels_test_gapi.hpp @@ -4,9 +4,9 @@ // // Copyright (C) 2018 Intel Corporation -#include "opencv2/core/ocl.hpp" -#include "opencv2/core/ocl_genbase.hpp" -#include "opencv2/core/opencl/ocl_defs.hpp" +#include +#include +#include #ifdef HAVE_OPENCL const char* opencl_symm7x7_src = diff --git a/modules/gapi/test/own/gapi_types_tests.cpp b/modules/gapi/test/own/gapi_types_tests.cpp index d84319079e..b40bb1df88 100644 --- a/modules/gapi/test/own/gapi_types_tests.cpp +++ b/modules/gapi/test/own/gapi_types_tests.cpp @@ -6,7 +6,7 @@ #include "../test_precomp.hpp" -#include "opencv2/gapi/own/types.hpp" +#include namespace opencv_test { diff --git a/modules/gapi/test/own/mat_tests.cpp b/modules/gapi/test/own/mat_tests.cpp index a6453c62c0..42245a53f1 100644 --- a/modules/gapi/test/own/mat_tests.cpp +++ b/modules/gapi/test/own/mat_tests.cpp @@ -6,7 +6,7 @@ #include "../test_precomp.hpp" -#include "opencv2/gapi/own/mat.hpp" +#include #include //suppress_unused_warning namespace opencv_test diff --git a/modules/gapi/test/own/scalar_tests.cpp b/modules/gapi/test/own/scalar_tests.cpp index 0ee626cc73..09fec67ab9 100644 --- a/modules/gapi/test/own/scalar_tests.cpp +++ b/modules/gapi/test/own/scalar_tests.cpp @@ -6,7 +6,7 @@ #include "../test_precomp.hpp" -#include "opencv2/gapi/own/scalar.hpp" +#include namespace opencv_test { diff --git a/modules/gapi/test/test_precomp.hpp b/modules/gapi/test/test_precomp.hpp index 9fb0e4d4f1..a2f8f3fc52 100644 --- a/modules/gapi/test/test_precomp.hpp +++ b/modules/gapi/test/test_precomp.hpp @@ -13,17 +13,17 @@ #include #include -#include "opencv2/ts.hpp" -#include "opencv2/gapi.hpp" -#include "opencv2/gapi/imgproc.hpp" -#include "opencv2/gapi/core.hpp" -#include "opencv2/gapi/cpu/gcpukernel.hpp" -#include "opencv2/gapi/gpu/ggpukernel.hpp" -#include "opencv2/gapi/gpu/imgproc.hpp" -#include "opencv2/gapi/gpu/core.hpp" -#include "opencv2/gapi/gcompoundkernel.hpp" -#include "opencv2/gapi/operators.hpp" -#include "opencv2/gapi/fluid/imgproc.hpp" -#include "opencv2/gapi/fluid/core.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif // __OPENCV_GAPI_TEST_PRECOMP_HPP__ diff --git a/modules/gapi/test/util/any_tests.cpp b/modules/gapi/test/util/any_tests.cpp index 1c6c9cc0a7..9d3e9c92a4 100644 --- a/modules/gapi/test/util/any_tests.cpp +++ b/modules/gapi/test/util/any_tests.cpp @@ -6,7 +6,7 @@ #include "../test_precomp.hpp" -#include "opencv2/gapi/util/any.hpp" +#include namespace opencv_test { diff --git a/modules/gapi/test/util/optional_tests.cpp b/modules/gapi/test/util/optional_tests.cpp index 7b6cdb1f21..7dde9fc638 100644 --- a/modules/gapi/test/util/optional_tests.cpp +++ b/modules/gapi/test/util/optional_tests.cpp @@ -6,7 +6,7 @@ #include "../test_precomp.hpp" -#include "opencv2/gapi/util/optional.hpp" +#include #include //suppress_unused_warning namespace opencv_test diff --git a/modules/gapi/test/util/variant_tests.cpp b/modules/gapi/test/util/variant_tests.cpp index 328afe7c9f..bdeea9445f 100644 --- a/modules/gapi/test/util/variant_tests.cpp +++ b/modules/gapi/test/util/variant_tests.cpp @@ -6,7 +6,7 @@ #include "../test_precomp.hpp" -#include "opencv2/gapi/util/variant.hpp" +#include #include //std::max_align_t namespace opencv_test