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
committed by
Alexander Alekhin
Alexander Alekhin
parent
d3c0f4ef98
commit
3df83dce7e
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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 {
|
||||
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user