Merge pull request #14741 from rgarnov:gapi_fix_includes

Changed quotes to brackets when including public includes (#14741)

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 <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>
 
 #endif // OPENCV_GAPI_HPP

modules/gapi/include/opencv2/gapi/core.hpp

@@ -12,9 +12,9 @@
 
 #include <opencv2/imgproc.hpp>
 
-#include "opencv2/gapi/gmat.hpp"
-#include "opencv2/gapi/gscalar.hpp"
-#include "opencv2/gapi/gkernel.hpp"
+#include <opencv2/gapi/gmat.hpp>
+#include <opencv2/gapi/gscalar.hpp>
+#include <opencv2/gapi/gkernel.hpp>
 
 /** \defgroup gapi_core G-API core (basic) functionality
 @{

modules/gapi/include/opencv2/gapi/cpu/core.hpp

@@ -9,7 +9,7 @@
 #define OPENCV_GAPI_CPU_CORE_API_HPP
 
 #include <opencv2/gapi/gkernel.hpp> // GKernelPackage
-#include "opencv2/gapi/own/exports.hpp" // GAPI_EXPORTS
+#include <opencv2/gapi/own/exports.hpp> // GAPI_EXPORTS
 
 namespace cv {
 namespace gapi {

modules/gapi/include/opencv2/gapi/fluid/gfluidbuffer.hpp

@@ -17,9 +17,9 @@
 #include <opencv2/gapi/own/mat.hpp>
 #include <opencv2/gapi/gmat.hpp>
 
-#include "opencv2/gapi/util/optional.hpp"
-#include "opencv2/gapi/own/scalar.hpp"
-#include "opencv2/gapi/own/mat.hpp"
+#include <opencv2/gapi/util/optional.hpp>
+#include <opencv2/gapi/own/scalar.hpp>
+#include <opencv2/gapi/own/mat.hpp>
 
 namespace cv {
 namespace gapi {

modules/gapi/include/opencv2/gapi/garg.hpp

@@ -12,17 +12,17 @@
 #include <type_traits>
 
 #include <opencv2/gapi/opencv_includes.hpp>
-#include "opencv2/gapi/own/mat.hpp"
+#include <opencv2/gapi/own/mat.hpp>
 
-#include "opencv2/gapi/util/any.hpp"
-#include "opencv2/gapi/util/variant.hpp"
+#include <opencv2/gapi/util/any.hpp>
+#include <opencv2/gapi/util/variant.hpp>
 
-#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 <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>
 
 namespace cv {
 

modules/gapi/include/opencv2/gapi/garray.hpp

@@ -18,7 +18,7 @@
 
 #include <opencv2/gapi/util/variant.hpp>
 #include <opencv2/gapi/util/throw.hpp>
-#include "opencv2/gapi/own/assert.hpp"
+#include <opencv2/gapi/own/assert.hpp>
 
 namespace cv
 {

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<T>
+#include <opencv2/gapi/garg.hpp>      // GArg
+#include <opencv2/gapi/gmat.hpp>      // GMat
+#include <opencv2/gapi/gscalar.hpp>   // GScalar
+#include <opencv2/gapi/garray.hpp>    // GArray<T>
 
 namespace cv {
 

modules/gapi/include/opencv2/gapi/gcommon.hpp

@@ -14,9 +14,9 @@
 
 #include <opencv2/gapi/opencv_includes.hpp>
 
-#include "opencv2/gapi/util/any.hpp"
-#include "opencv2/gapi/own/exports.hpp"
-#include "opencv2/gapi/own/assert.hpp"
+#include <opencv2/gapi/util/any.hpp>
+#include <opencv2/gapi/own/exports.hpp>
+#include <opencv2/gapi/own/assert.hpp>
 
 namespace cv {
 

modules/gapi/include/opencv2/gapi/gcompiled.hpp

@@ -10,9 +10,9 @@
 
 #include <vector>
 
-#include "opencv2/gapi/opencv_includes.hpp"
-#include "opencv2/gapi/own/assert.hpp"
-#include "opencv2/gapi/garg.hpp"
+#include <opencv2/gapi/opencv_includes.hpp>
+#include <opencv2/gapi/own/assert.hpp>
+#include <opencv2/gapi/garg.hpp>
 
 namespace cv {
 

modules/gapi/include/opencv2/gapi/gcompiled_async.hpp

@@ -11,7 +11,7 @@
 #include <future>           //for std::future
 #include <exception>        //for std::exception_ptr
 #include <functional>       //for std::function
-#include "opencv2/gapi/garg.hpp"
+#include <opencv2/gapi/garg.hpp>
 
 namespace cv {
     //fwd declaration

modules/gapi/include/opencv2/gapi/gcomputation.hpp

@@ -10,11 +10,11 @@
 
 #include <functional>
 
-#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 <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>
 
 namespace cv {
 

modules/gapi/include/opencv2/gapi/gcomputation_async.hpp

@@ -11,8 +11,8 @@
 #include <future>
 #include <exception>                        //for std::exception_ptr
 #include <functional>                       //for std::function
-#include "opencv2/gapi/garg.hpp"            //for GRunArgs, GRunArgsP
-#include "opencv2/gapi/gcommon.hpp"         //for GCompileArgs
+#include <opencv2/gapi/garg.hpp>            //for GRunArgs, GRunArgsP
+#include <opencv2/gapi/gcommon.hpp>         //for GCompileArgs
 
 namespace cv {
     //fwd declaration

modules/gapi/include/opencv2/gapi/gmat.hpp

@@ -14,9 +14,9 @@
 #include <opencv2/gapi/opencv_includes.hpp>
 #include <opencv2/gapi/gcommon.hpp> // 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 <opencv2/gapi/own/types.hpp> // cv::gapi::own::Size
+#include <opencv2/gapi/own/convert.hpp> // to_own
+#include <opencv2/gapi/own/assert.hpp>
 
 // TODO GAPI_EXPORTS or so
 namespace cv

modules/gapi/include/opencv2/gapi/gmetaarg.hpp

@@ -11,12 +11,12 @@
 #include <vector>
 #include <type_traits>
 
-#include "opencv2/gapi/util/util.hpp"
-#include "opencv2/gapi/util/variant.hpp"
+#include <opencv2/gapi/util/util.hpp>
+#include <opencv2/gapi/util/variant.hpp>
 
-#include "opencv2/gapi/gmat.hpp"
-#include "opencv2/gapi/gscalar.hpp"
-#include "opencv2/gapi/garray.hpp"
+#include <opencv2/gapi/gmat.hpp>
+#include <opencv2/gapi/gscalar.hpp>
+#include <opencv2/gapi/garray.hpp>
 
 namespace cv
 {

modules/gapi/include/opencv2/gapi/gproto.hpp

@@ -12,13 +12,13 @@
 #include <vector>
 #include <ostream>
 
-#include "opencv2/gapi/util/variant.hpp"
+#include <opencv2/gapi/util/variant.hpp>
 
-#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 <opencv2/gapi/gmat.hpp>
+#include <opencv2/gapi/gscalar.hpp>
+#include <opencv2/gapi/garray.hpp>
+#include <opencv2/gapi/garg.hpp>
+#include <opencv2/gapi/gmetaarg.hpp>
 
 namespace cv {
 

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 <opencv2/gapi/ocl/core.hpp> instead.
 */
 
-#include "opencv2/gapi/ocl/core.hpp"
+#include <opencv2/gapi/ocl/core.hpp>
 
 namespace cv {
 namespace gapi {

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 <opencv2/gapi/ocl/goclkernel.hpp> instead.
 */
 
-#include "opencv2/gapi/ocl/goclkernel.hpp"
+#include <opencv2/gapi/ocl/goclkernel.hpp>
 #define GAPI_GPU_KERNEL GAPI_OCL_KERNEL
 
 

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 <opencv2/gapi/ocl/imgproc.hpp> instead.
 */
 
-#include "opencv2/gapi/ocl/imgproc.hpp"
+#include <opencv2/gapi/ocl/imgproc.hpp>
 
 
 namespace cv {

modules/gapi/include/opencv2/gapi/gscalar.hpp

@@ -14,7 +14,7 @@
 #include <opencv2/gapi/opencv_includes.hpp>
 #include <opencv2/gapi/gcommon.hpp> // GShape
 #include <opencv2/gapi/util/optional.hpp>
-#include "opencv2/gapi/own/scalar.hpp"
+#include <opencv2/gapi/own/scalar.hpp>
 
 namespace cv
 {

modules/gapi/include/opencv2/gapi/gtyped.hpp

@@ -11,10 +11,10 @@
 
 #include <vector>
 
-#include "opencv2/gapi/gcomputation.hpp"
-#include "opencv2/gapi/gcompiled.hpp"
-#include "opencv2/gapi/gproto.hpp"
-#include "opencv2/gapi/gcommon.hpp"
+#include <opencv2/gapi/gcomputation.hpp>
+#include <opencv2/gapi/gcompiled.hpp>
+#include <opencv2/gapi/gproto.hpp>
+#include <opencv2/gapi/gcommon.hpp>
 
 namespace cv {
 

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 <opencv2/imgproc.hpp>
 
 #include <utility> // std::tuple
 
-#include "opencv2/gapi/gkernel.hpp"
-#include "opencv2/gapi/gmat.hpp"
-#include "opencv2/gapi/gscalar.hpp"
+#include <opencv2/gapi/gkernel.hpp>
+#include <opencv2/gapi/gmat.hpp>
+#include <opencv2/gapi/gscalar.hpp>
 
 
 /** \defgroup gapi_imgproc G-API image processing functionality

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 <opencv2/gapi/gmat.hpp>
+#include <opencv2/gapi/gscalar.hpp>
 
 GAPI_EXPORTS cv::GMat operator+(const cv::GMat&    lhs, const cv::GMat&    rhs);
 

modules/gapi/include/opencv2/gapi/own/assert.hpp

@@ -16,7 +16,7 @@
 #else
 #include <stdexcept>
 #include <sstream>
-#include "opencv2/gapi/util/throw.hpp"
+#include <opencv2/gapi/util/throw.hpp>
 
 namespace detail
 {

modules/gapi/include/opencv2/gapi/own/convert.hpp

@@ -13,7 +13,7 @@
 #include <opencv2/gapi/opencv_includes.hpp>
 #include <opencv2/gapi/own/types.hpp>
 #include <opencv2/gapi/own/mat.hpp>
-#include "opencv2/gapi/own/scalar.hpp"
+#include <opencv2/gapi/own/scalar.hpp>
 
 namespace cv
 {

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 <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 <memory>                   //std::shared_ptr
 #include <cstring>                  //std::memcpy
-#include "opencv2/gapi/util/throw.hpp"
+#include <opencv2/gapi/util/throw.hpp>
 
 namespace cv { namespace gapi { namespace own {
     namespace detail {

modules/gapi/include/opencv2/gapi/util/any.hpp

@@ -13,7 +13,7 @@
 #include <typeinfo>
 #include <utility>
 
-#include "opencv2/gapi/util/throw.hpp"
+#include <opencv2/gapi/util/throw.hpp>
 
 #if defined(_MSC_VER)
    // disable MSVC warning on "multiple copy constructors specified"

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 <opencv2/gapi/util/variant.hpp>
 
 // A poor man's `optional` implementation, incompletely modeled against C++17 spec.
 namespace cv

modules/gapi/include/opencv2/gapi/util/variant.hpp

@@ -11,8 +11,8 @@
 #include <array>
 #include <type_traits>
 
-#include "opencv2/gapi/util/throw.hpp"
-#include "opencv2/gapi/util/util.hpp" // max_of_t
+#include <opencv2/gapi/util/throw.hpp>
+#include <opencv2/gapi/util/util.hpp> // max_of_t
 
 // A poor man's `variant` implementation, incompletely modeled against C++17 spec.
 namespace cv

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 <opencv2/gapi/core.hpp>
 
 namespace opencv_test
 {

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 <opencv2/gapi/imgproc.hpp>
 
 namespace opencv_test
 {

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 <opencv2/gapi/cpu/core.hpp>
 
 #define CORE_CPU cv::gapi::core::cpu::kernels()
 

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 <opencv2/gapi/cpu/imgproc.hpp>
 
 #define IMGPROC_CPU cv::gapi::imgproc::cpu::kernels()
 

modules/gapi/perf/perf_precomp.hpp

@@ -11,17 +11,17 @@
 #include <cstdint>
 #include <vector>
 
-#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 <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 "opencv2/gapi/fluid/core.hpp"
-#include "opencv2/gapi/fluid/imgproc.hpp"
+#include <opencv2/gapi/fluid/core.hpp>
+#include <opencv2/gapi/fluid/imgproc.hpp>
 
 #endif // __OPENCV_GAPI_PERF_PRECOMP_HPP__

modules/gapi/src/api/garray.cpp

@@ -6,7 +6,7 @@
 
 
 #include "precomp.hpp"
-#include "opencv2/gapi/garray.hpp"
+#include <opencv2/gapi/garray.hpp>
 #include "api/gorigin.hpp"
 
 // cv::detail::GArrayU public implementation ///////////////////////////////////

modules/gapi/src/api/gbackend.cpp

@@ -8,8 +8,8 @@
 #include "precomp.hpp"
 #include <memory> // unique_ptr
 
-#include "opencv2/gapi/gkernel.hpp"
-#include "opencv2/gapi/own/convert.hpp"
+#include <opencv2/gapi/gkernel.hpp>
+#include <opencv2/gapi/own/convert.hpp>
 
 #include "api/gbackend_priv.hpp"
 #include "backends/common/gbackend.hpp"

modules/gapi/src/api/gcall.cpp

@@ -7,7 +7,7 @@
 
 #include "precomp.hpp"
 #include <cassert>
-#include "opencv2/gapi/gcall.hpp"
+#include <opencv2/gapi/gcall.hpp>
 #include "api/gcall_priv.hpp"
 
 // GCall private implementation ////////////////////////////////////////////////

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 <opencv2/gapi/gcomputation.hpp>
+#include <opencv2/gapi/gkernel.hpp>
 
 #include "api/gcomputation_priv.hpp"
 #include "api/gcall_priv.hpp"

modules/gapi/src/api/gkernel.cpp

@@ -13,7 +13,7 @@
 #include <ade/util/algorithm.hpp>
 
 #include "logger.hpp"
-#include "opencv2/gapi/gkernel.hpp"
+#include <opencv2/gapi/gkernel.hpp>
 
 #include "api/gbackend_priv.hpp"
 

modules/gapi/src/api/gmat.cpp

@@ -8,8 +8,8 @@
 #include "precomp.hpp"
 #include <opencv2/gapi/opencv_includes.hpp>
 #include <opencv2/gapi/own/mat.hpp> //gapi::own::Mat
+#include <opencv2/gapi/gmat.hpp>
 
-#include "opencv2/gapi/gmat.hpp"
 #include "api/gorigin.hpp"
 
 // cv::GMat public implementation //////////////////////////////////////////////

modules/gapi/src/api/gorigin.hpp

@@ -11,11 +11,11 @@
 #include <set>   // set
 #include <map>   // map
 
-#include "opencv2/gapi/util/variant.hpp"   // variant
-#include "opencv2/gapi/gcommon.hpp"
-#include "opencv2/gapi/opencv_includes.hpp"
-#include "compiler/gobjref.hpp"
+#include <opencv2/gapi/util/variant.hpp>   // variant
+#include <opencv2/gapi/gcommon.hpp>
+#include <opencv2/gapi/opencv_includes.hpp>
 
+#include "compiler/gobjref.hpp"
 #include "api/gnode.hpp"
 
 namespace cv

modules/gapi/src/api/gproto.cpp

@@ -8,9 +8,9 @@
 #include "precomp.hpp"
 
 #include <ade/util/algorithm.hpp>
-#include "opencv2/gapi/util/throw.hpp"
-#include "opencv2/gapi/garg.hpp"
-#include "opencv2/gapi/gproto.hpp"
+#include <opencv2/gapi/util/throw.hpp>
+#include <opencv2/gapi/garg.hpp>
+#include <opencv2/gapi/gproto.hpp>
 
 #include "api/gorigin.hpp"
 #include "api/gproto_priv.hpp"

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 <opencv2/gapi/gscalar.hpp>
+#include <opencv2/gapi/own/convert.hpp>
 #include "api/gorigin.hpp"
 
 // cv::GScalar public implementation ///////////////////////////////////////////

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 <opencv2/gapi/gcall.hpp>
+#include <opencv2/gapi/gscalar.hpp>
+#include <opencv2/gapi/gkernel.hpp>
+#include <opencv2/gapi/core.hpp>
 
 #include <tuple>
 #include <numeric>

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 <opencv2/gapi/gscalar.hpp>
+#include <opencv2/gapi/gcall.hpp>
+#include <opencv2/gapi/gkernel.hpp>
+#include <opencv2/gapi/imgproc.hpp>
 
 namespace cv { namespace gapi {
 

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 <opencv2/gapi/imgproc.hpp>
+#include <opencv2/gapi/core.hpp>
+#include <opencv2/gapi/gscalar.hpp>
+#include <opencv2/gapi/operators.hpp>
 
 cv::GMat operator+(const cv::GMat& lhs, const cv::GMat& rhs)
 {

modules/gapi/src/backends/common/gcompoundbackend.cpp

@@ -7,7 +7,7 @@
 
 #include "precomp.hpp"
 
-#include "opencv2/gapi/gcompoundkernel.hpp" // compound::backend()
+#include <opencv2/gapi/gcompoundkernel.hpp> // compound::backend()
 
 #include "api/gbackend_priv.hpp"
 #include "compiler/gislandmodel.hpp" // GIslandExecutable

modules/gapi/src/backends/common/gcompoundkernel.cpp

@@ -8,7 +8,7 @@
 #include "precomp.hpp"
 
 #include <ade/util/zip_range.hpp>   // util::indexed
-#include "opencv2/gapi/gcompoundkernel.hpp"
+#include <opencv2/gapi/gcompoundkernel.hpp>
 #include "compiler/gobjref.hpp"
 
 // FIXME move to backends

modules/gapi/src/backends/cpu/gcpubackend.cpp

@@ -18,16 +18,16 @@
 
 #include <ade/typed_graph.hpp>
 
-#include "opencv2/gapi/gcommon.hpp"
-#include "opencv2/gapi/util/any.hpp"
-#include "opencv2/gapi/gtype_traits.hpp"
+#include <opencv2/gapi/gcommon.hpp>
+#include <opencv2/gapi/util/any.hpp>
+#include <opencv2/gapi/gtype_traits.hpp>
 
 #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 <opencv2/gapi/cpu/imgproc.hpp>
+#include <opencv2/gapi/cpu/core.hpp>
 
 #include "api/gbackend_priv.hpp" // FIXME: Make it part of Backend SDK!
 

modules/gapi/src/backends/cpu/gcpubackend.hpp

@@ -13,9 +13,9 @@
 #include <tuple>              // tuple
 #include <ade/util/algorithm.hpp> // type_list_index
 
-#include "opencv2/gapi/garg.hpp"
-#include "opencv2/gapi/gproto.hpp"
-#include "opencv2/gapi/cpu/gcpukernel.hpp"
+#include <opencv2/gapi/garg.hpp>
+#include <opencv2/gapi/gproto.hpp>
+#include <opencv2/gapi/cpu/gcpukernel.hpp>
 
 #include "api/gorigin.hpp"
 #include "backends/common/gbackend.hpp"

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 <opencv2/gapi/core.hpp>
+#include <opencv2/gapi/cpu/core.hpp>
+#include <opencv2/gapi/cpu/gcpukernel.hpp>
 
 GAPI_OCV_KERNEL(GCPUAdd, cv::gapi::core::GAdd)
 {

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 <opencv2/gapi/imgproc.hpp>
+#include <opencv2/gapi/cpu/imgproc.hpp>
+#include <opencv2/gapi/cpu/gcpukernel.hpp>
 
 #include "backends/fluid/gfluidimgproc_func.hpp"
 

modules/gapi/src/backends/cpu/gcpukernel.cpp

@@ -9,7 +9,7 @@
 
 #include <cassert>
 
-#include "opencv2/gapi/cpu/gcpukernel.hpp"
+#include <opencv2/gapi/cpu/gcpukernel.hpp>
 
 const cv::gapi::own::Mat& cv::GCPUContext::inMat(int input)
 {

modules/gapi/src/backends/fluid/gfluidbackend.cpp

@@ -22,11 +22,11 @@
 #include <ade/typed_graph.hpp>
 #include <ade/execution_engine/execution_engine.hpp>
 
-#include "opencv2/gapi/gcommon.hpp"
+#include <opencv2/gapi/gcommon.hpp>
 #include "logger.hpp"
 
-#include "opencv2/gapi/own/convert.hpp"
-#include "opencv2/gapi/gmat.hpp"    //for version of descr_of
+#include <opencv2/gapi/own/convert.hpp>
+#include <opencv2/gapi/gmat.hpp>    //for version of descr_of
 // PRIVATE STUFF!
 #include "compiler/gobjref.hpp"
 #include "compiler/gmodel.hpp"

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 <opencv2/gapi/garg.hpp>
+#include <opencv2/gapi/gproto.hpp>
+#include <opencv2/gapi/fluid/gfluidkernel.hpp>
+#include <opencv2/gapi/fluid/gfluidbuffer.hpp>
 
 // PRIVATE STUFF!
 #include "backends/common/gbackend.hpp"

modules/gapi/src/backends/fluid/gfluidbuffer.cpp

@@ -9,12 +9,12 @@
 
 #include <iomanip>   // hex, dec (debug)
 
-#include "opencv2/gapi/own/convert.hpp"
-#include "opencv2/gapi/own/types.hpp"
+#include <opencv2/gapi/own/convert.hpp>
+#include <opencv2/gapi/own/types.hpp>
 
-#include "opencv2/gapi/fluid/gfluidbuffer.hpp"
+#include <opencv2/gapi/fluid/gfluidbuffer.hpp>
 #include "backends/fluid/gfluidbuffer_priv.hpp"
-#include "opencv2/gapi/opencv_includes.hpp"
+#include <opencv2/gapi/opencv_includes.hpp>
 
 #include "backends/fluid/gfluidutils.hpp" // saturate
 

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 <opencv2/gapi/own/assert.hpp>
+#include <opencv2/core/traits.hpp>
+#include <opencv2/core/hal/hal.hpp>
+#include <opencv2/core/hal/intrin.hpp>
 
-#include "opencv2/gapi/core.hpp"
+#include <opencv2/gapi/core.hpp>
 
-#include "opencv2/gapi/fluid/gfluidbuffer.hpp"
-#include "opencv2/gapi/fluid/gfluidkernel.hpp"
-#include "opencv2/gapi/fluid/core.hpp"
+#include <opencv2/gapi/fluid/gfluidbuffer.hpp>
+#include <opencv2/gapi/fluid/gfluidkernel.hpp>
+#include <opencv2/gapi/fluid/core.hpp>
 
 #include "gfluidbuffer_priv.hpp"
 #include "gfluidbackend.hpp"

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 <opencv2/gapi/own/assert.hpp>
+#include <opencv2/core/traits.hpp>
+#include <opencv2/imgproc/types_c.h>
 
-#include "opencv2/gapi/core.hpp"
-#include "opencv2/gapi/imgproc.hpp"
+#include <opencv2/gapi/core.hpp>
+#include <opencv2/gapi/imgproc.hpp>
 
-#include "opencv2/gapi/own/types.hpp"
+#include <opencv2/gapi/own/types.hpp>
 
-#include "opencv2/gapi/fluid/gfluidbuffer.hpp"
-#include "opencv2/gapi/fluid/gfluidkernel.hpp"
-#include "opencv2/gapi/fluid/imgproc.hpp"
+#include <opencv2/gapi/fluid/gfluidbuffer.hpp>
+#include <opencv2/gapi/fluid/gfluidkernel.hpp>
+#include <opencv2/gapi/fluid/imgproc.hpp>
 
 #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 <opencv2/imgproc/hal/hal.hpp>
+#include <opencv2/core/hal/intrin.hpp>
 
 #include <cmath>
 #include <cstdlib>

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 <opencv2/core/cvdef.h>
+#include <opencv2/core/hal/intrin.hpp>
 
 #include <cmath>
 #include <cstdlib>

modules/gapi/src/backends/fluid/gfluidimgproc_func.hpp

@@ -8,7 +8,7 @@
 
 #if !defined(GAPI_STANDALONE)
 
-#include "opencv2/core.hpp"
+#include <opencv2/core.hpp>
 
 namespace cv {
 namespace gapi {

modules/gapi/src/backends/ocl/goclbackend.cpp

@@ -18,9 +18,9 @@
 
 #include <ade/typed_graph.hpp>
 
-#include "opencv2/gapi/gcommon.hpp"
-#include "opencv2/gapi/util/any.hpp"
-#include "opencv2/gapi/gtype_traits.hpp"
+#include <opencv2/gapi/gcommon.hpp>
+#include <opencv2/gapi/util/any.hpp>
+#include <opencv2/gapi/gtype_traits.hpp>
 
 #include "compiler/gobjref.hpp"
 #include "compiler/gmodel.hpp"

modules/gapi/src/backends/ocl/goclbackend.hpp

@@ -13,9 +13,9 @@
 #include <tuple>              // tuple
 #include <ade/util/algorithm.hpp> // type_list_index
 
-#include "opencv2/gapi/garg.hpp"
-#include "opencv2/gapi/gproto.hpp"
-#include "opencv2/gapi/ocl/goclkernel.hpp"
+#include <opencv2/gapi/garg.hpp>
+#include <opencv2/gapi/gproto.hpp>
+#include <opencv2/gapi/ocl/goclkernel.hpp>
 
 #include "api/gorigin.hpp"
 #include "backends/common/gbackend.hpp"

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 <opencv2/gapi/core.hpp>
+#include <opencv2/gapi/ocl/core.hpp>
 #include "backends/ocl/goclcore.hpp"
 
 GAPI_OCL_KERNEL(GOCLAdd, cv::gapi::core::GAdd)

modules/gapi/src/backends/ocl/goclcore.hpp

@@ -11,7 +11,7 @@
 #include <map>
 #include <string>
 
-#include "opencv2/gapi/ocl/goclkernel.hpp"
+#include <opencv2/gapi/ocl/goclkernel.hpp>
 
 namespace cv { namespace gimpl {
 

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 <opencv2/gapi/imgproc.hpp>
+#include <opencv2/gapi/ocl/imgproc.hpp>
 #include "backends/ocl/goclimgproc.hpp"
 
 

modules/gapi/src/backends/ocl/goclimgproc.hpp

@@ -11,7 +11,7 @@
 #include <map>
 #include <string>
 
-#include "opencv2/gapi/ocl/goclkernel.hpp"
+#include <opencv2/gapi/ocl/goclkernel.hpp>
 
 namespace cv { namespace gimpl {
 

modules/gapi/src/backends/ocl/goclkernel.cpp

@@ -7,7 +7,7 @@
 
 #include <cassert>
 
-#include "opencv2/gapi/ocl/goclkernel.hpp"
+#include <opencv2/gapi/ocl/goclkernel.hpp>
 
 const cv::UMat& cv::GOCLContext::inMat(int input)
 {

modules/gapi/src/compiler/gcompiled.cpp

@@ -9,8 +9,8 @@
 
 #include <ade/graph.hpp>
 
-#include "opencv2/gapi/gproto.hpp" // can_describe
-#include "opencv2/gapi/gcompiled.hpp"
+#include <opencv2/gapi/gproto.hpp> // can_describe
+#include <opencv2/gapi/gcompiled.hpp>
 
 #include "compiler/gcompiled_priv.hpp"
 #include "backends/common/gbackend.hpp"

modules/gapi/src/compiler/gcompiler.cpp

@@ -35,12 +35,12 @@
 
 // <FIXME:>
 #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 <opencv2/gapi/cpu/core.hpp>    // Also directly refer to Core
+#include <opencv2/gapi/cpu/imgproc.hpp> // ...and Imgproc kernel implementations
 #endif // !defined(GAPI_STANDALONE)
 // </FIXME:>
 
-#include "opencv2/gapi/gcompoundkernel.hpp" // compound::backend()
+#include <opencv2/gapi/gcompoundkernel.hpp> // compound::backend()
 
 #include "logger.hpp"
 

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 <opencv2/gapi/gcommon.hpp>
+#include <opencv2/gapi/gkernel.hpp>
+#include <opencv2/gapi/gcomputation.hpp>
 
 #include <ade/execution_engine/execution_engine.hpp>
 

modules/gapi/src/compiler/gislandmodel.hpp

@@ -15,8 +15,8 @@
 #include <ade/typed_graph.hpp>
 #include <ade/passes/topological_sort.hpp>
 
-#include "opencv2/gapi/util/optional.hpp"
-#include "opencv2/gapi/gkernel.hpp"
+#include <opencv2/gapi/util/optional.hpp>
+#include <opencv2/gapi/gkernel.hpp>
 
 #include "compiler/gobjref.hpp"
 

modules/gapi/src/compiler/gmodel.cpp

@@ -14,7 +14,7 @@
 #include <ade/util/zip_range.hpp>   // util::indexed
 #include <ade/util/checked_cast.hpp>
 
-#include "opencv2/gapi/gproto.hpp"
+#include <opencv2/gapi/gproto.hpp>
 #include "api/gnode_priv.hpp"
 #include "compiler/gobjref.hpp"
 #include "compiler/gmodel.hpp"

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 <opencv2/gapi/garg.hpp>
+#include <opencv2/gapi/gkernel.hpp>
 
 #include "compiler/gobjref.hpp"
 #include "compiler/gislandmodel.hpp"

modules/gapi/src/compiler/gmodelbuilder.hpp

@@ -11,8 +11,8 @@
 #include <map>
 #include <unordered_map>
 
-#include "opencv2/gapi/gproto.hpp"
-#include "opencv2/gapi/gcall.hpp"
+#include <opencv2/gapi/gproto.hpp>
+#include <opencv2/gapi/gcall.hpp>
 
 #include "api/gorigin.hpp"
 #include "api/gnode.hpp"

modules/gapi/src/compiler/passes/dump_dot.cpp

@@ -14,7 +14,7 @@
 
 #include <ade/passes/check_cycles.hpp>
 
-#include "opencv2/gapi/gproto.hpp"
+#include <opencv2/gapi/gproto.hpp>
 #include "compiler/gmodel.hpp"
 #include "compiler/gislandmodel.hpp"
 #include "compiler/passes/passes.hpp"

modules/gapi/src/compiler/passes/exec.cpp

@@ -17,7 +17,7 @@
 #include <ade/util/algorithm.hpp>   // contains
 #include <ade/util/chain_range.hpp> // chain
 
-#include "opencv2/gapi/util/optional.hpp"  // util::optional
+#include <opencv2/gapi/util/optional.hpp>  // util::optional
 #include "logger.hpp"    // GAPI_LOG
 
 #include "compiler/gmodel.hpp"

modules/gapi/src/compiler/passes/helpers.cpp

@@ -13,7 +13,7 @@
 
 #include <ade/util/filter_range.hpp>
 
-#include "opencv2/gapi/own/assert.hpp" // GAPI_Assert
+#include <opencv2/gapi/own/assert.hpp> // GAPI_Assert
 #include "compiler/passes/helpers.hpp"
 
 namespace {

modules/gapi/src/compiler/passes/kernels.cpp

@@ -11,7 +11,7 @@
 #include <ade/graph.hpp>
 #include <ade/passes/check_cycles.hpp>
 
-#include "opencv2/gapi/gcompoundkernel.hpp" // compound::backend()
+#include <opencv2/gapi/gcompoundkernel.hpp> // compound::backend()
 
 #include "compiler/gmodel.hpp"
 #include "compiler/passes/passes.hpp"

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 <opencv2/gapi/gcomputation_async.hpp>
+#include <opencv2/gapi/gcomputation.hpp>
+#include <opencv2/gapi/gcompiled_async.hpp>
+#include <opencv2/gapi/gcompiled.hpp>
 
 #include <condition_variable>
 

modules/gapi/src/executor/gexecutor.cpp

@@ -11,7 +11,7 @@
 
 #include <ade/util/zip_range.hpp>
 
-#include "opencv2/gapi/opencv_includes.hpp"
+#include <opencv2/gapi/opencv_includes.hpp>
 #include "executor/gexecutor.hpp"
 #include "compiler/passes/passes.hpp"
 

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 <opencv2/core.hpp>
+#  include <opencv2/imgproc.hpp>
+#  include <opencv2/gapi/core.hpp>
+#  include <opencv2/gapi/imgproc.hpp>
 #endif //  !defined(GAPI_STANDALONE)
 
-#include "opencv2/gapi.hpp"
-#include "opencv2/gapi/gkernel.hpp"
+#include <opencv2/gapi.hpp>
+#include <opencv2/gapi/gkernel.hpp>
 
 #endif // __OPENCV_GAPI_PRECOMP_HPP__

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 <opencv2/gapi/cpu/core.hpp>
 
 #include <ade/util/algorithm.hpp>
 

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 <opencv2/gapi/core.hpp>
 #include "gapi_core_tests.hpp"
 
 namespace opencv_test

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 <opencv2/gapi/imgproc.hpp>
 #include "gapi_imgproc_tests.hpp"
 
 namespace opencv_test

modules/gapi/test/common/gapi_tests_common.hpp

@@ -7,8 +7,8 @@
 
 #include <iostream>
 
-#include "opencv2/ts.hpp"
-#include "opencv2/gapi.hpp"
+#include <opencv2/ts.hpp>
+#include <opencv2/gapi.hpp>
 
 namespace
 {

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 <opencv2/gapi/cpu/core.hpp>
 
 #define CORE_CPU cv::gapi::core::cpu::kernels()
 

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 <opencv2/gapi/cpu/imgproc.hpp>
 
 #define IMGPROC_CPU cv::gapi::imgproc::cpu::kernels()
 

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 <opencv2/gapi/cpu/core.hpp>
 
 #define CORE_CPU cv::gapi::core::cpu::kernels()
 

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 <opencv2/gapi/gcomputation_async.hpp>
+#include <opencv2/gapi/gcompiled_async.hpp>
 
 #include <condition_variable>
 #include <stdexcept>

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 <opencv2/gapi/fluid/gfluidkernel.hpp>
 
 namespace opencv_test
 {

modules/gapi/test/gapi_desc_tests.cpp

@@ -7,7 +7,7 @@
 
 #include "test_precomp.hpp"
 
-#include "opencv2/gapi/cpu/gcpukernel.hpp"
+#include <opencv2/gapi/cpu/gcpukernel.hpp>
 
 namespace opencv_test
 {

modules/gapi/test/gapi_fluid_test.cpp

@@ -7,10 +7,10 @@
 
 #include "test_precomp.hpp"
 
-#include "opencv2/gapi/core.hpp"
+#include <opencv2/gapi/core.hpp>
 
-#include "opencv2/gapi/fluid/gfluidbuffer.hpp"
-#include "opencv2/gapi/fluid/gfluidkernel.hpp"
+#include <opencv2/gapi/fluid/gfluidbuffer.hpp>
+#include <opencv2/gapi/fluid/gfluidkernel.hpp>
 
  // FIXME: move these tests with priv() to internal suite
 #include "backends/fluid/gfluidbuffer_priv.hpp"

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 <opencv2/gapi/fluid/gfluidkernel.hpp>
 
 namespace cv
 {

modules/gapi/test/gapi_gcomputation_tests.cpp

@@ -6,7 +6,7 @@
 
 
 #include "test_precomp.hpp"
-#include "opencv2/gapi/cpu/gcpukernel.hpp"
+#include <opencv2/gapi/cpu/gcpukernel.hpp>
 #include <ade/util/zip_range.hpp>
 
 namespace opencv_test

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 <opencv2/gapi/gpu/ggpukernel.hpp>
 #include "opencl_kernels_test_gapi.hpp"
 
 

modules/gapi/test/gapi_kernel_tests.cpp

@@ -6,11 +6,11 @@
 
 
 #include "test_precomp.hpp"
-#include "opencv2/gapi/cpu/gcpukernel.hpp"
+#include <opencv2/gapi/cpu/gcpukernel.hpp>
 #include "gapi_mock_kernels.hpp"
 
-#include "opencv2/gapi/cpu/gcpukernel.hpp"     // cpu::backend
-#include "opencv2/gapi/fluid/gfluidkernel.hpp" // fluid::backend
+#include <opencv2/gapi/cpu/gcpukernel.hpp>     // cpu::backend
+#include <opencv2/gapi/fluid/gfluidkernel.hpp> // fluid::backend
 
 namespace opencv_test
 {

modules/gapi/test/gapi_mock_kernels.hpp

@@ -5,7 +5,7 @@
 // Copyright (C) 2018 Intel Corporation
 
 
-#include "opencv2/gapi/cpu/gcpukernel.hpp"
+#include <opencv2/gapi/cpu/gcpukernel.hpp>
 
 #include "api/gbackend_priv.hpp" // directly instantiate GBackend::Priv
 

modules/gapi/test/gapi_util_tests.cpp

@@ -9,7 +9,7 @@
 
 #include <type_traits>
 
-#include "opencv2/gapi/util/util.hpp"
+#include <opencv2/gapi/util/util.hpp>
 
 namespace opencv_test
 {

modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp

@@ -9,7 +9,7 @@
 
 #include <ade/util/zip_range.hpp>   // util::indexed
 
-#include "opencv2/gapi/gkernel.hpp"
+#include <opencv2/gapi/gkernel.hpp>
 #include "compiler/gmodelbuilder.hpp"
 #include "compiler/gmodel.hpp" // RcDesc, GModel::init
 

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 <opencv2/gapi/fluid/gfluidkernel.hpp>
+#include <opencv2/gapi/fluid/core.hpp>
+#include <opencv2/gapi/fluid/imgproc.hpp>
 
 namespace opencv_test
 {

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 <opencv2/core/ocl.hpp>
+#include <opencv2/core/ocl_genbase.hpp>
+#include <opencv2/core/opencl/ocl_defs.hpp>
 
 #ifdef HAVE_OPENCL
 const char* opencl_symm7x7_src =