Merge pull request #14741 from rgarnov:gapi_fix_includes

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
+1 -1
View File
@@ -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 ///////////////////////////////////
+2 -2
View File
@@ -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"
+1 -1
View File
@@ -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 ////////////////////////////////////////////////
+2 -2
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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 //////////////////////////////////////////////
+4 -4
View File
@@ -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
+3 -3
View File
@@ -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"
+2 -2
View File
@@ -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 ///////////////////////////////////////////
+4 -4
View File
@@ -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>
+4 -4
View File
@@ -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 {
+4 -4
View File
@@ -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)
{
@@ -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
@@ -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
@@ -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!
@@ -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"
+3 -3
View File
@@ -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)
{
@@ -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"
+1 -1
View File
@@ -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)
{
@@ -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"
@@ -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"
@@ -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
@@ -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"
@@ -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>
@@ -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>
@@ -8,7 +8,7 @@
#if !defined(GAPI_STANDALONE)
#include "opencv2/core.hpp"
#include <opencv2/core.hpp>
namespace cv {
namespace gapi {
@@ -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"
@@ -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"
+2 -2
View File
@@ -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)
+1 -1
View File
@@ -11,7 +11,7 @@
#include <map>
#include <string>
#include "opencv2/gapi/ocl/goclkernel.hpp"
#include <opencv2/gapi/ocl/goclkernel.hpp>
namespace cv { namespace gimpl {
@@ -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"
@@ -11,7 +11,7 @@
#include <map>
#include <string>
#include "opencv2/gapi/ocl/goclkernel.hpp"
#include <opencv2/gapi/ocl/goclkernel.hpp>
namespace cv { namespace gimpl {
+1 -1
View File
@@ -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)
{
+2 -2
View File
@@ -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"
+3 -3
View File
@@ -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"
+3 -3
View File
@@ -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>
+2 -2
View File
@@ -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"
+1 -1
View File
@@ -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"
+2 -2
View File
@@ -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"
+2 -2
View File
@@ -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"
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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 {
+1 -1
View File
@@ -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"
+4 -4
View File
@@ -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>
+1 -1
View File
@@ -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"
+6 -6
View File
@@ -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__