potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages 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/test/common/gapi_compoundkernel_tests.cpp
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+3 -3
View File
@@ -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 =
modules/gapi/test/own/gapi_types_tests.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "../test_precomp.hpp"
#include "opencv2/gapi/own/types.hpp"
#include <opencv2/gapi/own/types.hpp>
namespace opencv_test
{
modules/gapi/test/own/mat_tests.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "../test_precomp.hpp"
#include "opencv2/gapi/own/mat.hpp"
#include <opencv2/gapi/own/mat.hpp>
#include <opencv2/gapi/util/compiler_hints.hpp> //suppress_unused_warning
namespace opencv_test
modules/gapi/test/own/scalar_tests.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "../test_precomp.hpp"
#include "opencv2/gapi/own/scalar.hpp"
#include <opencv2/gapi/own/scalar.hpp>
namespace opencv_test
{
modules/gapi/test/test_precomp.hpp
+12 -12
View File
@@ -13,17 +13,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/gcompoundkernel.hpp"
#include "opencv2/gapi/operators.hpp"
#include "opencv2/gapi/fluid/imgproc.hpp"
#include "opencv2/gapi/fluid/core.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/gcompoundkernel.hpp>
#include <opencv2/gapi/operators.hpp>
#include <opencv2/gapi/fluid/imgproc.hpp>
#include <opencv2/gapi/fluid/core.hpp>
#endif // __OPENCV_GAPI_TEST_PRECOMP_HPP__
modules/gapi/test/util/any_tests.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "../test_precomp.hpp"
#include "opencv2/gapi/util/any.hpp"
#include <opencv2/gapi/util/any.hpp>
namespace opencv_test
{
modules/gapi/test/util/optional_tests.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "../test_precomp.hpp"
#include "opencv2/gapi/util/optional.hpp"
#include <opencv2/gapi/util/optional.hpp>
#include <opencv2/gapi/util/compiler_hints.hpp> //suppress_unused_warning
namespace opencv_test
modules/gapi/test/util/variant_tests.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "../test_precomp.hpp"
#include "opencv2/gapi/util/variant.hpp"
#include <opencv2/gapi/util/variant.hpp>
#include <cstddef> //std::max_align_t
namespace opencv_test