mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14741 from rgarnov:gapi_fix_includes

Browse Source 
Changed quotes to brackets when including public includes (#14741)
This commit is contained in:
Ruslan Garnov 2019-06-14 19:27:19 +03:00 committed by Alexander Alekhin
parent d3c0f4ef98
commit 3df83dce7e
107 changed files with 270 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/gapi/include/opencv2/gapi.hpp
View File

@ -22,12 +22,12 @@
@} @}
*/ */
#include "opencv2/gapi/gmat.hpp" #include <opencv2/gapi/gmat.hpp>
#include "opencv2/gapi/garray.hpp" #include <opencv2/gapi/garray.hpp>
#include "opencv2/gapi/gcomputation.hpp" #include <opencv2/gapi/gcomputation.hpp>
#include "opencv2/gapi/gcompiled.hpp" #include <opencv2/gapi/gcompiled.hpp>
#include "opencv2/gapi/gtyped.hpp" #include <opencv2/gapi/gtyped.hpp>
#include "opencv2/gapi/gkernel.hpp" #include <opencv2/gapi/gkernel.hpp>
#include "opencv2/gapi/operators.hpp" #include <opencv2/gapi/operators.hpp>
#endif // OPENCV_GAPI_HPP #endif // OPENCV_GAPI_HPP

6
modules/gapi/include/opencv2/gapi/core.hpp
View File

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

2
modules/gapi/include/opencv2/gapi/cpu/core.hpp
View File

@ -9,7 +9,7 @@
#define OPENCV_GAPI_CPU_CORE_API_HPP #define OPENCV_GAPI_CPU_CORE_API_HPP
#include <opencv2/gapi/gkernel.hpp> // GKernelPackage #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 cv {
namespace gapi { namespace gapi {

6
modules/gapi/include/opencv2/gapi/fluid/gfluidbuffer.hpp
View File

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

18
modules/gapi/include/opencv2/gapi/garg.hpp
View File

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

2
modules/gapi/include/opencv2/gapi/garray.hpp
View File

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

8
modules/gapi/include/opencv2/gapi/gcall.hpp
View File

@ -8,10 +8,10 @@
#ifndef OPENCV_GAPI_GCALL_HPP #ifndef OPENCV_GAPI_GCALL_HPP
#define OPENCV_GAPI_GCALL_HPP #define OPENCV_GAPI_GCALL_HPP
#include "opencv2/gapi/garg.hpp" // GArg #include <opencv2/gapi/garg.hpp> // GArg
#include "opencv2/gapi/gmat.hpp" // GMat #include <opencv2/gapi/gmat.hpp> // GMat
#include "opencv2/gapi/gscalar.hpp" // GScalar #include <opencv2/gapi/gscalar.hpp> // GScalar
#include "opencv2/gapi/garray.hpp" // GArray<T> #include <opencv2/gapi/garray.hpp> // GArray<T>
namespace cv { namespace cv {

6
modules/gapi/include/opencv2/gapi/gcommon.hpp
View File

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

6
modules/gapi/include/opencv2/gapi/gcompiled.hpp
View File

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

2
modules/gapi/include/opencv2/gapi/gcompiled_async.hpp
View File

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

10
modules/gapi/include/opencv2/gapi/gcomputation.hpp
View File

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

4
modules/gapi/include/opencv2/gapi/gcomputation_async.hpp
View File

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

6
modules/gapi/include/opencv2/gapi/gmat.hpp
View File

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

10
modules/gapi/include/opencv2/gapi/gmetaarg.hpp
View File

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

12
modules/gapi/include/opencv2/gapi/gproto.hpp
View File

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

4
modules/gapi/include/opencv2/gapi/gpu/core.hpp
View File

@ -8,10 +8,10 @@
#ifndef OPENCV_GAPI_GPU_CORE_API_HPP #ifndef OPENCV_GAPI_GPU_CORE_API_HPP
#define OPENCV_GAPI_GPU_CORE_API_HPP #define OPENCV_GAPI_GPU_CORE_API_HPP
/** @file /** @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 cv {
namespace gapi { namespace gapi {

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

@ -8,10 +8,10 @@
#ifndef OPENCV_GAPI_GGPUKERNEL_HPP #ifndef OPENCV_GAPI_GGPUKERNEL_HPP
#define OPENCV_GAPI_GGPUKERNEL_HPP #define OPENCV_GAPI_GGPUKERNEL_HPP
/** @file /** @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 #define GAPI_GPU_KERNEL GAPI_OCL_KERNEL

4
modules/gapi/include/opencv2/gapi/gpu/imgproc.hpp
View File

@ -8,10 +8,10 @@
#ifndef OPENCV_GAPI_GPU_IMGPROC_API_HPP #ifndef OPENCV_GAPI_GPU_IMGPROC_API_HPP
#define OPENCV_GAPI_GPU_IMGPROC_API_HPP #define OPENCV_GAPI_GPU_IMGPROC_API_HPP
/** @file /** @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 { namespace cv {

2
modules/gapi/include/opencv2/gapi/gscalar.hpp
View File

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

8
modules/gapi/include/opencv2/gapi/gtyped.hpp
View File

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

8
modules/gapi/include/opencv2/gapi/imgproc.hpp
View File

@ -8,13 +8,13 @@
#ifndef OPENCV_GAPI_IMGPROC_HPP #ifndef OPENCV_GAPI_IMGPROC_HPP
#define OPENCV_GAPI_IMGPROC_HPP #define OPENCV_GAPI_IMGPROC_HPP
#include "opencv2/imgproc.hpp" #include <opencv2/imgproc.hpp>
#include <utility> // std::tuple #include <utility> // std::tuple
#include "opencv2/gapi/gkernel.hpp" #include <opencv2/gapi/gkernel.hpp>
#include "opencv2/gapi/gmat.hpp" #include <opencv2/gapi/gmat.hpp>
#include "opencv2/gapi/gscalar.hpp" #include <opencv2/gapi/gscalar.hpp>
/** \defgroup gapi_imgproc G-API image processing functionality /** \defgroup gapi_imgproc G-API image processing functionality

4
modules/gapi/include/opencv2/gapi/operators.hpp
View File

@ -8,8 +8,8 @@
#ifndef OPENCV_GAPI_OPERATORS_HPP #ifndef OPENCV_GAPI_OPERATORS_HPP
#define OPENCV_GAPI_OPERATORS_HPP #define OPENCV_GAPI_OPERATORS_HPP
#include "opencv2/gapi/gmat.hpp" #include <opencv2/gapi/gmat.hpp>
#include "opencv2/gapi/gscalar.hpp" #include <opencv2/gapi/gscalar.hpp>
GAPI_EXPORTS cv::GMat operator+(const cv::GMat& lhs, const cv::GMat& rhs); GAPI_EXPORTS cv::GMat operator+(const cv::GMat& lhs, const cv::GMat& rhs);

2
modules/gapi/include/opencv2/gapi/own/assert.hpp
View File

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

2
modules/gapi/include/opencv2/gapi/own/convert.hpp
View File

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

12
modules/gapi/include/opencv2/gapi/own/mat.hpp
View File

@ -8,15 +8,15 @@
#ifndef OPENCV_GAPI_OWN_MAT_HPP #ifndef OPENCV_GAPI_OWN_MAT_HPP
#define OPENCV_GAPI_OWN_MAT_HPP #define OPENCV_GAPI_OWN_MAT_HPP
#include "opencv2/gapi/opencv_includes.hpp" #include <opencv2/gapi/opencv_includes.hpp>
#include "opencv2/gapi/own/types.hpp" #include <opencv2/gapi/own/types.hpp>
#include "opencv2/gapi/own/scalar.hpp" #include <opencv2/gapi/own/scalar.hpp>
#include "opencv2/gapi/own/saturate.hpp" #include <opencv2/gapi/own/saturate.hpp>
#include "opencv2/gapi/own/assert.hpp" #include <opencv2/gapi/own/assert.hpp>
#include <memory> //std::shared_ptr #include <memory> //std::shared_ptr
#include <cstring> //std::memcpy #include <cstring> //std::memcpy
#include "opencv2/gapi/util/throw.hpp" #include <opencv2/gapi/util/throw.hpp>
namespace cv { namespace gapi { namespace own { namespace cv { namespace gapi { namespace own {
namespace detail { namespace detail {

2
modules/gapi/include/opencv2/gapi/util/any.hpp
View File

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

2
modules/gapi/include/opencv2/gapi/util/optional.hpp
View File

@ -8,7 +8,7 @@
#ifndef OPENCV_GAPI_UTIL_OPTIONAL_HPP #ifndef OPENCV_GAPI_UTIL_OPTIONAL_HPP
#define 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. // A poor man's `optional` implementation, incompletely modeled against C++17 spec.
namespace cv namespace cv

4
modules/gapi/include/opencv2/gapi/util/variant.hpp
View File

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

2
modules/gapi/perf/common/gapi_core_perf_tests.hpp
View File

@ -10,7 +10,7 @@
#include "../../test/common/gapi_tests_common.hpp" #include "../../test/common/gapi_tests_common.hpp"
#include "opencv2/gapi/core.hpp" #include <opencv2/gapi/core.hpp>
namespace opencv_test namespace opencv_test
{ {

2
modules/gapi/perf/common/gapi_imgproc_perf_tests.hpp
View File

@ -11,7 +11,7 @@
#include "../../test/common/gapi_tests_common.hpp" #include "../../test/common/gapi_tests_common.hpp"
#include "opencv2/gapi/imgproc.hpp" #include <opencv2/gapi/imgproc.hpp>
namespace opencv_test namespace opencv_test
{ {

2
modules/gapi/perf/cpu/gapi_core_perf_tests_cpu.cpp
View File

@ -7,7 +7,7 @@
#include "../perf_precomp.hpp" #include "../perf_precomp.hpp"
#include "../common/gapi_core_perf_tests.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() #define CORE_CPU cv::gapi::core::cpu::kernels()

3
modules/gapi/perf/cpu/gapi_imgproc_perf_tests_cpu.cpp
View File

@ -7,8 +7,7 @@
#include "../perf_precomp.hpp" #include "../perf_precomp.hpp"
#include "../common/gapi_imgproc_perf_tests.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() #define IMGPROC_CPU cv::gapi::imgproc::cpu::kernels()

22
modules/gapi/perf/perf_precomp.hpp
View File

@ -11,17 +11,17 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
#include "opencv2/ts.hpp" #include <opencv2/ts.hpp>
#include "opencv2/gapi.hpp" #include <opencv2/gapi.hpp>
#include "opencv2/gapi/imgproc.hpp" #include <opencv2/gapi/imgproc.hpp>
#include "opencv2/gapi/core.hpp" #include <opencv2/gapi/core.hpp>
#include "opencv2/gapi/cpu/gcpukernel.hpp" #include <opencv2/gapi/cpu/gcpukernel.hpp>
#include "opencv2/gapi/gpu/ggpukernel.hpp" #include <opencv2/gapi/gpu/ggpukernel.hpp>
#include "opencv2/gapi/gpu/imgproc.hpp" #include <opencv2/gapi/gpu/imgproc.hpp>
#include "opencv2/gapi/gpu/core.hpp" #include <opencv2/gapi/gpu/core.hpp>
#include "opencv2/gapi/operators.hpp" #include <opencv2/gapi/operators.hpp>
#include "opencv2/gapi/fluid/core.hpp" #include <opencv2/gapi/fluid/core.hpp>
#include "opencv2/gapi/fluid/imgproc.hpp" #include <opencv2/gapi/fluid/imgproc.hpp>
#endif // __OPENCV_GAPI_PERF_PRECOMP_HPP__ #endif // __OPENCV_GAPI_PERF_PRECOMP_HPP__

2
modules/gapi/src/api/garray.cpp
View File

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

4
modules/gapi/src/api/gbackend.cpp
View File

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

2
modules/gapi/src/api/gcall.cpp
View File

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

4
modules/gapi/src/api/gcomputation.cpp
View File

@ -12,8 +12,8 @@
#include "logger.hpp" // GAPI_LOG #include "logger.hpp" // GAPI_LOG
#include "opencv2/gapi/gcomputation.hpp" #include <opencv2/gapi/gcomputation.hpp>
#include "opencv2/gapi/gkernel.hpp" #include <opencv2/gapi/gkernel.hpp>
#include "api/gcomputation_priv.hpp" #include "api/gcomputation_priv.hpp"
#include "api/gcall_priv.hpp" #include "api/gcall_priv.hpp"

2
modules/gapi/src/api/gkernel.cpp
View File

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

2
modules/gapi/src/api/gmat.cpp
View File

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

8
modules/gapi/src/api/gorigin.hpp
View File

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

6
modules/gapi/src/api/gproto.cpp
View File

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

4
modules/gapi/src/api/gscalar.cpp
View File

@ -7,8 +7,8 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/gapi/gscalar.hpp" #include <opencv2/gapi/gscalar.hpp>
#include "opencv2/gapi/own/convert.hpp" #include <opencv2/gapi/own/convert.hpp>
#include "api/gorigin.hpp" #include "api/gorigin.hpp"
// cv::GScalar public implementation /////////////////////////////////////////// // cv::GScalar public implementation ///////////////////////////////////////////

8
modules/gapi/src/api/kernels_core.cpp
View File

@ -7,10 +7,10 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/gapi/gcall.hpp" #include <opencv2/gapi/gcall.hpp>
#include "opencv2/gapi/gscalar.hpp" #include <opencv2/gapi/gscalar.hpp>
#include "opencv2/gapi/gkernel.hpp" #include <opencv2/gapi/gkernel.hpp>
#include "opencv2/gapi/core.hpp" #include <opencv2/gapi/core.hpp>
#include <tuple> #include <tuple>
#include <numeric> #include <numeric>

8
modules/gapi/src/api/kernels_imgproc.cpp
View File

@ -7,10 +7,10 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/gapi/gscalar.hpp" #include <opencv2/gapi/gscalar.hpp>
#include "opencv2/gapi/gcall.hpp" #include <opencv2/gapi/gcall.hpp>
#include "opencv2/gapi/gkernel.hpp" #include <opencv2/gapi/gkernel.hpp>
#include "opencv2/gapi/imgproc.hpp" #include <opencv2/gapi/imgproc.hpp>
namespace cv { namespace gapi { namespace cv { namespace gapi {

8
modules/gapi/src/api/operators.cpp
View File

@ -7,10 +7,10 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/gapi/imgproc.hpp" #include <opencv2/gapi/imgproc.hpp>
#include "opencv2/gapi/core.hpp" #include <opencv2/gapi/core.hpp>
#include "opencv2/gapi/gscalar.hpp" #include <opencv2/gapi/gscalar.hpp>
#include "opencv2/gapi/operators.hpp" #include <opencv2/gapi/operators.hpp>
cv::GMat operator+(const cv::GMat& lhs, const cv::GMat& rhs) cv::GMat operator+(const cv::GMat& lhs, const cv::GMat& rhs)
{ {

2
modules/gapi/src/backends/common/gcompoundbackend.cpp
View File

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

2
modules/gapi/src/backends/common/gcompoundkernel.cpp
View File

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

10
modules/gapi/src/backends/cpu/gcpubackend.cpp
View File

@ -18,16 +18,16 @@
#include <ade/typed_graph.hpp> #include <ade/typed_graph.hpp>
#include "opencv2/gapi/gcommon.hpp" #include <opencv2/gapi/gcommon.hpp>
#include "opencv2/gapi/util/any.hpp" #include <opencv2/gapi/util/any.hpp>
#include "opencv2/gapi/gtype_traits.hpp" #include <opencv2/gapi/gtype_traits.hpp>
#include "compiler/gobjref.hpp" #include "compiler/gobjref.hpp"
#include "compiler/gmodel.hpp" #include "compiler/gmodel.hpp"
#include "backends/cpu/gcpubackend.hpp" #include "backends/cpu/gcpubackend.hpp"
#include "opencv2/gapi/cpu/imgproc.hpp" #include <opencv2/gapi/cpu/imgproc.hpp>
#include "opencv2/gapi/cpu/core.hpp" #include <opencv2/gapi/cpu/core.hpp>
#include "api/gbackend_priv.hpp" // FIXME: Make it part of Backend SDK! #include "api/gbackend_priv.hpp" // FIXME: Make it part of Backend SDK!

6
modules/gapi/src/backends/cpu/gcpubackend.hpp
View File

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

6
modules/gapi/src/backends/cpu/gcpucore.cpp
View File

@ -7,9 +7,9 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/gapi/core.hpp" #include <opencv2/gapi/core.hpp>
#include "opencv2/gapi/cpu/core.hpp" #include <opencv2/gapi/cpu/core.hpp>
#include "opencv2/gapi/cpu/gcpukernel.hpp" #include <opencv2/gapi/cpu/gcpukernel.hpp>
GAPI_OCV_KERNEL(GCPUAdd, cv::gapi::core::GAdd) GAPI_OCV_KERNEL(GCPUAdd, cv::gapi::core::GAdd)
{ {

6
modules/gapi/src/backends/cpu/gcpuimgproc.cpp
View File

@ -7,9 +7,9 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/gapi/imgproc.hpp" #include <opencv2/gapi/imgproc.hpp>
#include "opencv2/gapi/cpu/imgproc.hpp" #include <opencv2/gapi/cpu/imgproc.hpp>
#include "opencv2/gapi/cpu/gcpukernel.hpp" #include <opencv2/gapi/cpu/gcpukernel.hpp>
#include "backends/fluid/gfluidimgproc_func.hpp" #include "backends/fluid/gfluidimgproc_func.hpp"

2
modules/gapi/src/backends/cpu/gcpukernel.cpp
View File

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

6
modules/gapi/src/backends/fluid/gfluidbackend.cpp
View File

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

8
modules/gapi/src/backends/fluid/gfluidbackend.hpp
View File

@ -10,10 +10,10 @@
// FIXME? Actually gfluidbackend.hpp is not included anywhere // FIXME? Actually gfluidbackend.hpp is not included anywhere
// and can be placed in gfluidbackend.cpp // and can be placed in gfluidbackend.cpp
#include "opencv2/gapi/garg.hpp" #include <opencv2/gapi/garg.hpp>
#include "opencv2/gapi/gproto.hpp" #include <opencv2/gapi/gproto.hpp>
#include "opencv2/gapi/fluid/gfluidkernel.hpp" #include <opencv2/gapi/fluid/gfluidkernel.hpp>
#include "opencv2/gapi/fluid/gfluidbuffer.hpp" #include <opencv2/gapi/fluid/gfluidbuffer.hpp>
// PRIVATE STUFF! // PRIVATE STUFF!
#include "backends/common/gbackend.hpp" #include "backends/common/gbackend.hpp"

8
modules/gapi/src/backends/fluid/gfluidbuffer.cpp
View File

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

16
modules/gapi/src/backends/fluid/gfluidcore.cpp
View File

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

22
modules/gapi/src/backends/fluid/gfluidimgproc.cpp
View File

@ -8,18 +8,18 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/gapi/own/assert.hpp" #include <opencv2/gapi/own/assert.hpp>
#include "opencv2/core/traits.hpp" #include <opencv2/core/traits.hpp>
#include "opencv2/imgproc/types_c.h" #include <opencv2/imgproc/types_c.h>
#include "opencv2/gapi/core.hpp" #include <opencv2/gapi/core.hpp>
#include "opencv2/gapi/imgproc.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/gfluidbuffer.hpp>
#include "opencv2/gapi/fluid/gfluidkernel.hpp" #include <opencv2/gapi/fluid/gfluidkernel.hpp>
#include "opencv2/gapi/fluid/imgproc.hpp" #include <opencv2/gapi/fluid/imgproc.hpp>
#include "gfluidbuffer_priv.hpp" #include "gfluidbuffer_priv.hpp"
#include "gfluidbackend.hpp" #include "gfluidbackend.hpp"
@ -27,8 +27,8 @@
#include "gfluidimgproc_func.hpp" #include "gfluidimgproc_func.hpp"
#include "opencv2/imgproc/hal/hal.hpp" #include <opencv2/imgproc/hal/hal.hpp>
#include "opencv2/core/hal/intrin.hpp" #include <opencv2/core/hal/intrin.hpp>
#include <cmath> #include <cmath>
#include <cstdlib> #include <cstdlib>

4
modules/gapi/src/backends/fluid/gfluidimgproc_func.dispatch.cpp
View File

@ -12,8 +12,8 @@
#include "gfluidutils.hpp" #include "gfluidutils.hpp"
#include "opencv2/core/cvdef.h" #include <opencv2/core/cvdef.h>
#include "opencv2/core/hal/intrin.hpp" #include <opencv2/core/hal/intrin.hpp>
#include <cmath> #include <cmath>
#include <cstdlib> #include <cstdlib>

2
modules/gapi/src/backends/fluid/gfluidimgproc_func.hpp
View File

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

6
modules/gapi/src/backends/ocl/goclbackend.cpp
View File

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

6
modules/gapi/src/backends/ocl/goclbackend.hpp
View File

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

4
modules/gapi/src/backends/ocl/goclcore.cpp
View File

@ -7,8 +7,8 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/gapi/core.hpp" #include <opencv2/gapi/core.hpp>
#include "opencv2/gapi/ocl/core.hpp" #include <opencv2/gapi/ocl/core.hpp>
#include "backends/ocl/goclcore.hpp" #include "backends/ocl/goclcore.hpp"
GAPI_OCL_KERNEL(GOCLAdd, cv::gapi::core::GAdd) GAPI_OCL_KERNEL(GOCLAdd, cv::gapi::core::GAdd)

2
modules/gapi/src/backends/ocl/goclcore.hpp
View File

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

4
modules/gapi/src/backends/ocl/goclimgproc.cpp
View File

@ -7,8 +7,8 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/gapi/imgproc.hpp" #include <opencv2/gapi/imgproc.hpp>
#include "opencv2/gapi/ocl/imgproc.hpp" #include <opencv2/gapi/ocl/imgproc.hpp>
#include "backends/ocl/goclimgproc.hpp" #include "backends/ocl/goclimgproc.hpp"

2
modules/gapi/src/backends/ocl/goclimgproc.hpp
View File

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

2
modules/gapi/src/backends/ocl/goclkernel.cpp
View File

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

4
modules/gapi/src/compiler/gcompiled.cpp
View File

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

6
modules/gapi/src/compiler/gcompiler.cpp
View File

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

6
modules/gapi/src/compiler/gcompiler.hpp
View File

@ -9,9 +9,9 @@
#define OPENCV_GAPI_GCOMPILER_HPP #define OPENCV_GAPI_GCOMPILER_HPP
#include "opencv2/gapi/gcommon.hpp" #include <opencv2/gapi/gcommon.hpp>
#include "opencv2/gapi/gkernel.hpp" #include <opencv2/gapi/gkernel.hpp>
#include "opencv2/gapi/gcomputation.hpp" #include <opencv2/gapi/gcomputation.hpp>
#include <ade/execution_engine/execution_engine.hpp> #include <ade/execution_engine/execution_engine.hpp>

4
modules/gapi/src/compiler/gislandmodel.hpp
View File

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

2
modules/gapi/src/compiler/gmodel.cpp
View File

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

4
modules/gapi/src/compiler/gmodel.hpp
View File

@ -22,8 +22,8 @@
// This part of the system is API-unaware by its design. // This part of the system is API-unaware by its design.
// //
#include "opencv2/gapi/garg.hpp" #include <opencv2/gapi/garg.hpp>
#include "opencv2/gapi/gkernel.hpp" #include <opencv2/gapi/gkernel.hpp>
#include "compiler/gobjref.hpp" #include "compiler/gobjref.hpp"
#include "compiler/gislandmodel.hpp" #include "compiler/gislandmodel.hpp"

4
modules/gapi/src/compiler/gmodelbuilder.hpp
View File

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

2
modules/gapi/src/compiler/passes/dump_dot.cpp
View File

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

2
modules/gapi/src/compiler/passes/exec.cpp
View File

@ -17,7 +17,7 @@
#include <ade/util/algorithm.hpp> // contains #include <ade/util/algorithm.hpp> // contains
#include <ade/util/chain_range.hpp> // chain #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 "logger.hpp" // GAPI_LOG
#include "compiler/gmodel.hpp" #include "compiler/gmodel.hpp"

2
modules/gapi/src/compiler/passes/helpers.cpp
View File

@ -13,7 +13,7 @@
#include <ade/util/filter_range.hpp> #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" #include "compiler/passes/helpers.hpp"
namespace { namespace {

2
modules/gapi/src/compiler/passes/kernels.cpp
View File

@ -11,7 +11,7 @@
#include <ade/graph.hpp> #include <ade/graph.hpp>
#include <ade/passes/check_cycles.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/gmodel.hpp"
#include "compiler/passes/passes.hpp" #include "compiler/passes/passes.hpp"

8
modules/gapi/src/executor/gasync.cpp
View File

@ -4,10 +4,10 @@
// //
// Copyright (C) 2019 Intel Corporation // Copyright (C) 2019 Intel Corporation
#include "opencv2/gapi/gcomputation_async.hpp" #include <opencv2/gapi/gcomputation_async.hpp>
#include "opencv2/gapi/gcomputation.hpp" #include <opencv2/gapi/gcomputation.hpp>
#include "opencv2/gapi/gcompiled_async.hpp" #include <opencv2/gapi/gcompiled_async.hpp>
#include "opencv2/gapi/gcompiled.hpp" #include <opencv2/gapi/gcompiled.hpp>
#include <condition_variable> #include <condition_variable>

2
modules/gapi/src/executor/gexecutor.cpp
View File

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

12
modules/gapi/src/precomp.hpp
View File

@ -9,13 +9,13 @@
#define __OPENCV_GAPI_PRECOMP_HPP__ #define __OPENCV_GAPI_PRECOMP_HPP__
#if !defined(GAPI_STANDALONE) #if !defined(GAPI_STANDALONE)
# include "opencv2/core.hpp" # include <opencv2/core.hpp>
# include "opencv2/imgproc.hpp" # include <opencv2/imgproc.hpp>
# include "opencv2/gapi/core.hpp" # include <opencv2/gapi/core.hpp>
# include "opencv2/gapi/imgproc.hpp" # include <opencv2/gapi/imgproc.hpp>
#endif // !defined(GAPI_STANDALONE) #endif // !defined(GAPI_STANDALONE)
#include "opencv2/gapi.hpp" #include <opencv2/gapi.hpp>
#include "opencv2/gapi/gkernel.hpp" #include <opencv2/gapi/gkernel.hpp>
#endif // __OPENCV_GAPI_PRECOMP_HPP__ #endif // __OPENCV_GAPI_PRECOMP_HPP__

2
modules/gapi/test/common/gapi_compoundkernel_tests.cpp
View File

@ -8,7 +8,7 @@
// FIXME: move out from Common // FIXME: move out from Common
#include "../test_precomp.hpp" #include "../test_precomp.hpp"
#include "opencv2/gapi/cpu/core.hpp" #include <opencv2/gapi/cpu/core.hpp>
#include <ade/util/algorithm.hpp> #include <ade/util/algorithm.hpp>

2
modules/gapi/test/common/gapi_core_tests_inl.hpp
View File

@ -8,7 +8,7 @@
#ifndef OPENCV_GAPI_CORE_TESTS_INL_HPP #ifndef OPENCV_GAPI_CORE_TESTS_INL_HPP
#define 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" #include "gapi_core_tests.hpp"
namespace opencv_test namespace opencv_test

2
modules/gapi/test/common/gapi_imgproc_tests_inl.hpp
View File

@ -8,7 +8,7 @@
#ifndef OPENCV_GAPI_IMGPROC_TESTS_INL_HPP #ifndef OPENCV_GAPI_IMGPROC_TESTS_INL_HPP
#define 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" #include "gapi_imgproc_tests.hpp"
namespace opencv_test namespace opencv_test

4
modules/gapi/test/common/gapi_tests_common.hpp
View File

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

2
modules/gapi/test/cpu/gapi_core_tests_cpu.cpp
View File

@ -7,7 +7,7 @@
#include "../test_precomp.hpp" #include "../test_precomp.hpp"
#include "../common/gapi_core_tests.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() #define CORE_CPU cv::gapi::core::cpu::kernels()

2
modules/gapi/test/cpu/gapi_imgproc_tests_cpu.cpp
View File

@ -8,7 +8,7 @@
#include "../test_precomp.hpp" #include "../test_precomp.hpp"
#include "../common/gapi_imgproc_tests.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() #define IMGPROC_CPU cv::gapi::imgproc::cpu::kernels()

2
modules/gapi/test/cpu/gapi_operators_tests_cpu.cpp
View File

@ -7,7 +7,7 @@
#include "../test_precomp.hpp" #include "../test_precomp.hpp"
#include "../common/gapi_operators_tests.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() #define CORE_CPU cv::gapi::core::cpu::kernels()

4
modules/gapi/test/gapi_async_test.cpp
View File

@ -6,8 +6,8 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
#include "opencv2/gapi/gcomputation_async.hpp" #include <opencv2/gapi/gcomputation_async.hpp>
#include "opencv2/gapi/gcompiled_async.hpp" #include <opencv2/gapi/gcompiled_async.hpp>
#include <condition_variable> #include <condition_variable>
#include <stdexcept> #include <stdexcept>

2
modules/gapi/test/gapi_basic_hetero_tests.cpp
View File

@ -8,7 +8,7 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
#include "gapi_mock_kernels.hpp" #include "gapi_mock_kernels.hpp"
#include "opencv2/gapi/fluid/gfluidkernel.hpp" #include <opencv2/gapi/fluid/gfluidkernel.hpp>
namespace opencv_test namespace opencv_test
{ {

2
modules/gapi/test/gapi_desc_tests.cpp
View File

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

6
modules/gapi/test/gapi_fluid_test.cpp
View File

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

2
modules/gapi/test/gapi_fluid_test_kernels.hpp
View File

@ -8,7 +8,7 @@
#ifndef GAPI_FLUID_TEST_KERNELS_HPP #ifndef GAPI_FLUID_TEST_KERNELS_HPP
#define 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 namespace cv
{ {

2
modules/gapi/test/gapi_gcomputation_tests.cpp
View File

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

2
modules/gapi/test/gapi_gpu_test.cpp
View File

@ -10,7 +10,7 @@
#include "logger.hpp" #include "logger.hpp"
#include "common/gapi_tests_common.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" #include "opencl_kernels_test_gapi.hpp"

6
modules/gapi/test/gapi_kernel_tests.cpp
View File

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

2
modules/gapi/test/gapi_mock_kernels.hpp
View File

@ -5,7 +5,7 @@
// Copyright (C) 2018 Intel Corporation // 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 #include "api/gbackend_priv.hpp" // directly instantiate GBackend::Priv

2
modules/gapi/test/gapi_util_tests.cpp
View File

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

2
modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp
View File

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

6
modules/gapi/test/internal/gapi_int_recompilation_test.cpp
View File

@ -8,9 +8,9 @@
#include "../test_precomp.hpp" #include "../test_precomp.hpp"
#include "api/gcomputation_priv.hpp" #include "api/gcomputation_priv.hpp"
#include "opencv2/gapi/fluid/gfluidkernel.hpp" #include <opencv2/gapi/fluid/gfluidkernel.hpp>
#include "opencv2/gapi/fluid/core.hpp" #include <opencv2/gapi/fluid/core.hpp>
#include "opencv2/gapi/fluid/imgproc.hpp" #include <opencv2/gapi/fluid/imgproc.hpp>
namespace opencv_test namespace opencv_test
{ {

6
modules/gapi/test/opencl_kernels_test_gapi.hpp
View File

@ -4,9 +4,9 @@
// //
// Copyright (C) 2018 Intel Corporation // Copyright (C) 2018 Intel Corporation
#include "opencv2/core/ocl.hpp" #include <opencv2/core/ocl.hpp>
#include "opencv2/core/ocl_genbase.hpp" #include <opencv2/core/ocl_genbase.hpp>
#include "opencv2/core/opencl/ocl_defs.hpp" #include <opencv2/core/opencl/ocl_defs.hpp>
#ifdef HAVE_OPENCL #ifdef HAVE_OPENCL
const char* opencl_symm7x7_src = const char* opencl_symm7x7_src =

Some files were not shown because too many files have changed in this diff Show More