third_party/opencv
1
0
Fork 0
Code Issues Pull Requests 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
Download Patch File Download Diff File Expand all files Collapse all files
modules/gapi/include/opencv2/gapi.hpp
+7 -7
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+9 -9
View File
@@ -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
+1 -1
View File
@@ -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
+4 -4
View File
@@ -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
+3 -3
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+5 -5
View File
@@ -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
+2 -2
View File
@@ -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
+3 -3
View File
@@ -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
+5 -5
View File
@@ -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
+6 -6
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+4 -4
View File
@@ -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
+4 -4
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+6 -6
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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