Skip to content

Commit 5b40516

Browse files
committed
remove comments & fix includes
1 parent 9d83493 commit 5b40516

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+595
-598
lines changed

demos/background_subtraction_demo/cpp_gapi/include/custom_kernels.hpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
#pragma once
66

7-
#include <string> // for string
8-
#include <vector> // for vector
7+
#include <string>
8+
#include <vector>
99

10-
#include <cpp/ie_cnn_network.h> // for CNNNetwork
11-
#include <ie_allocator.hpp> // for InferenceEngine
12-
#include <ie_common.h> // for OutputsDataMap
13-
#include <ie_input_info.hpp> // for InputsDataMap
14-
#include <opencv2/core.hpp> // for Size, CV_8U
15-
#include <opencv2/gapi/gkernel.hpp> // for G_API_OP, KernelTypeMedium, GKernelPackage
16-
#include <opencv2/gapi/gmat.hpp> // for GMatDesc, GMat
10+
#include <cpp/ie_cnn_network.h>
11+
#include <ie_allocator.hpp>
12+
#include <ie_common.h>
13+
#include <ie_input_info.hpp>
14+
#include <opencv2/core.hpp>
15+
#include <opencv2/gapi/gkernel.hpp>
16+
#include <opencv2/gapi/gmat.hpp>
1717

1818
namespace IE = InferenceEngine;
1919

demos/background_subtraction_demo/cpp_gapi/main.cpp

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,55 @@
22
// SPDX-License-Identifier: Apache-2.0
33
//
44

5-
#include <stddef.h> // for size_t
6-
7-
#include <algorithm> // for max
8-
#include <chrono> // for steady_clock
9-
#include <exception> // for exception
10-
#include <iomanip> // for operator<<, _Setprecision, setprecision, fixed
11-
#include <limits> // for numeric_limits
12-
#include <memory> // for shared_ptr, make_shared, __shared_ptr_access
13-
#include <stdexcept> // for logic_error
14-
#include <string> // for allocator, operator==, operator+, string, basic_string, char...
15-
#include <utility> // for move
16-
#include <vector> // for vector
17-
18-
#include <opencv2/core.hpp> // for Size, Mat, CV_8UC3, Scalar
19-
#include <opencv2/gapi/core.hpp> // for resize
20-
#include <opencv2/gapi/cpu/core.hpp> // for kernels
21-
#include <opencv2/gapi/cpu/imgproc.hpp> // for kernels
22-
#include <opencv2/gapi/fluid/core.hpp> // for kernels
23-
#include <opencv2/gapi/fluid/imgproc.hpp> // for kernels
24-
#include <opencv2/gapi/garg.hpp> // for gin, operator+=, gout
25-
#include <opencv2/gapi/gcommon.hpp> // for compile_args
26-
#include <opencv2/gapi/gcomputation.hpp> // for GComputation, GComputation::Generator
27-
#include <opencv2/gapi/gkernel.hpp> // for combine, GKernelPackage
28-
#include <opencv2/gapi/gmat.hpp> // for GMat
29-
#include <opencv2/gapi/gproto.hpp> // for GIn, GOut, operator+=, GIOProtoArgs
30-
#include <opencv2/gapi/gstreaming.hpp> // for GStreamingCompiled
31-
#include <opencv2/gapi/imgproc.hpp> // for blur
32-
#include <opencv2/gapi/infer.hpp> // for networks, Generic (ptr only)
33-
#include <opencv2/gapi/infer/ie.hpp> // for Params
34-
#include <opencv2/gapi/own/assert.hpp> // for GAPI_Assert
35-
#include <opencv2/gapi/streaming/source.hpp> // for make_src
36-
#include <opencv2/gapi/util/optional.hpp> // for optional, make_optional
37-
#include <opencv2/highgui.hpp> // for imshow, waitKey
38-
#include <opencv2/imgproc.hpp> // for FONT_HERSHEY_COMPLEX
39-
#include <openvino/openvino.hpp> // for get_openvino_version
40-
41-
#include <monitors/presenter.h> // for Presenter
42-
#include <utils/args_helper.hpp> // for stringToSize
43-
#include <utils/common.hpp> // for fileNameNoExt, operator<<, showAvailableDevices
44-
#include <utils/config_factory.h> // for ModelConfig, ConfigFactory
45-
#include <utils/images_capture.h> // for openImagesCapture, ImagesCapture, read_type, read_type::safe
46-
#include <utils/ocv_common.hpp> // for LazyVideoWriter
47-
#include <utils/performance_metrics.hpp> // for PerformanceMetrics, PerformanceMetrics::FPS, PerformanceMetr...
48-
#include <utils/slog.hpp> // for LogStream, endl, info, err
49-
#include <utils_gapi/stream_source.hpp> // for CommonCapSrc
50-
51-
#include "background_subtraction_demo_gapi.hpp" // for FLAGS_m, FLAGS_at, FLAGS_target_bgr, FLAGS_blur_bgr, FLAGS_d
52-
#include "custom_kernels.hpp" // for BGMattingReplacer, MaskRCNNBGReplacer, kernels, NNBGReplacer
53-
#include "gflags/gflags.h" // for clstring, ParseCommandLineNonHelpFlags
5+
#include <stddef.h>
6+
7+
#include <algorithm>
8+
#include <chrono>
9+
#include <exception>
10+
#include <iomanip>
11+
#include <limits>
12+
#include <memory>
13+
#include <stdexcept>
14+
#include <string>
15+
#include <utility>
16+
#include <vector>
17+
18+
#include <gflags/gflags.h>
19+
#include <opencv2/core.hpp>
20+
#include <opencv2/gapi/core.hpp>
21+
#include <opencv2/gapi/cpu/core.hpp>
22+
#include <opencv2/gapi/cpu/imgproc.hpp>
23+
#include <opencv2/gapi/fluid/core.hpp>
24+
#include <opencv2/gapi/fluid/imgproc.hpp>
25+
#include <opencv2/gapi/garg.hpp>
26+
#include <opencv2/gapi/gcommon.hpp>
27+
#include <opencv2/gapi/gcomputation.hpp>
28+
#include <opencv2/gapi/gkernel.hpp>
29+
#include <opencv2/gapi/gmat.hpp>
30+
#include <opencv2/gapi/gproto.hpp>
31+
#include <opencv2/gapi/gstreaming.hpp>
32+
#include <opencv2/gapi/imgproc.hpp>
33+
#include <opencv2/gapi/infer.hpp>
34+
#include <opencv2/gapi/infer/ie.hpp>
35+
#include <opencv2/gapi/own/assert.hpp>
36+
#include <opencv2/gapi/streaming/source.hpp>
37+
#include <opencv2/gapi/util/optional.hpp>
38+
#include <opencv2/highgui.hpp>
39+
#include <opencv2/imgproc.hpp>
40+
#include <openvino/openvino.hpp>
41+
42+
#include <monitors/presenter.h>
43+
#include <utils/args_helper.hpp>
44+
#include <utils/common.hpp>
45+
#include <utils/config_factory.h>
46+
#include <utils/images_capture.h>
47+
#include <utils/ocv_common.hpp>
48+
#include <utils/performance_metrics.hpp>
49+
#include <utils/slog.hpp>
50+
#include <utils_gapi/stream_source.hpp>
51+
52+
#include "background_subtraction_demo_gapi.hpp"
53+
#include "custom_kernels.hpp"
5454

5555
namespace util {
5656
bool ParseAndCheckCommandLine(int argc, char* argv[]) {

demos/background_subtraction_demo/cpp_gapi/src/custom_kernels.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44

55
#include "custom_kernels.hpp"
66

7-
#include <algorithm> // for max, copy_n, min
8-
#include <map> // for _Rb_tree_iterator, map<>::mapped_type
9-
#include <memory> // for __shared_ptr_access, allocator_traits<>::value_type, shared_ptr
10-
#include <stdexcept> // for logic_error
11-
#include <utility> // for pair
12-
13-
#include <ie_core.hpp> // for Core
14-
#include <ie_data.h> // for Data
15-
#include <ie_layouts.h> // for TensorDesc
16-
#include <opencv2/gapi/core.hpp> // for convertTo, merge3, mul, resize
17-
#include <opencv2/gapi/cpu/gcpukernel.hpp> // for GAPI_OCV_KERNEL, GCPUKernelImpl
18-
#include <opencv2/gapi/gscalar.hpp> // for GScalar
19-
#include <opencv2/gapi/imgproc.hpp> // for medianBlur
20-
#include <opencv2/gapi/infer.hpp> // for infer, GInferInputs, GInferOutputsTyped, GInferInputsTyped<>::Sto...
21-
#include <opencv2/gapi/operators.hpp> // for operator&, operator+, operator-, operator~
22-
#include <opencv2/gapi/own/assert.hpp> // for GAPI_Assert
23-
#include <opencv2/imgproc.hpp> // for resize
7+
#include <algorithm>
8+
#include <map>
9+
#include <memory>
10+
#include <stdexcept>
11+
#include <utility>
12+
13+
#include <ie_core.hpp>
14+
#include <ie_data.h>
15+
#include <ie_layouts.h>
16+
#include <opencv2/gapi/core.hpp>
17+
#include <opencv2/gapi/cpu/gcpukernel.hpp>
18+
#include <opencv2/gapi/gscalar.hpp>
19+
#include <opencv2/gapi/imgproc.hpp>
20+
#include <opencv2/gapi/infer.hpp>
21+
#include <opencv2/gapi/operators.hpp>
22+
#include <opencv2/gapi/own/assert.hpp>
23+
#include <opencv2/imgproc.hpp>
2424

2525
// clang-format off
2626
GAPI_OCV_KERNEL(OCVTensorToImg, custom::GTensorToImg) {

demos/common/cpp/utils/include/utils/images_capture.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
// Copyright (C) 2020 Intel Corporation
1+
// Copyright (C) 2020-2022 Intel Corporation
22
// SPDX-License-Identifier: Apache-2.0
33
//
44

55
#pragma once
6-
#include <stddef.h> // for size_t
6+
#include <stddef.h>
77

8-
#include <limits> // for numeric_limits
9-
#include <memory> // for unique_ptr
10-
#include <string> // for string
8+
#include <limits>
9+
#include <memory>
10+
#include <string>
1111

12-
#include <opencv2/core.hpp> // for Mat, Size
12+
#include <opencv2/core.hpp>
1313

14-
#include "utils/performance_metrics.hpp" // for PerformanceMetrics
14+
#include "utils/performance_metrics.hpp"
1515

1616
enum class read_type { efficient, safe };
1717

demos/common/cpp/utils/src/images_capture.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
// Copyright (C) 2020 Intel Corporation
1+
// Copyright (C) 2020-2022 Intel Corporation
22
// SPDX-License-Identifier: Apache-2.0
33
//
44
#include "utils/images_capture.h"
55

6-
#include <string.h> // for size_t, strcmp
6+
#include <string.h>
77

88
#ifdef _WIN32
99
# include "w_dirent.hpp"
1010
#else
1111
# include <dirent.h> // for closedir, dirent, opendir, readdir, DIR
1212
#endif
1313

14-
#include <algorithm> // for max, sort
15-
#include <chrono> // for steady_clock
16-
#include <fstream> // for ifstream
17-
#include <memory> // for allocator, unique_ptr
18-
#include <stdexcept> // for runtime_error, invalid_argument, out_of_range
19-
#include <string> // for string, operator+, operator<, basic_string, char_traits, swap, stoi
20-
#include <vector> // for vector
14+
#include <algorithm>
15+
#include <chrono>
16+
#include <fstream>
17+
#include <memory>
18+
#include <stdexcept>
19+
#include <string>
20+
#include <vector>
2121

22-
#include <opencv2/imgcodecs.hpp> // for imread
23-
#include <opencv2/videoio.hpp> // for VideoCapture, CAP_PROP_FPS, CAP_PROP_POS_FRAMES, CAP_PROP_AUTOFOCUS, CAP_PR...
22+
#include <opencv2/imgcodecs.hpp>
23+
#include <opencv2/videoio.hpp>
2424

2525
class InvalidInput : public std::runtime_error {
2626
public:

demos/common/cpp_gapi/utils_gapi/include/utils_gapi/stream_source.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
#pragma once
66

7-
#include <memory> // for shared_ptr
7+
#include <memory>
88

9-
#include <opencv2/core.hpp> // for Mat
10-
#include <opencv2/gapi/gmetaarg.hpp> // for GMetaArg
11-
#include <opencv2/gapi/streaming/source.hpp> // for IStreamSource
9+
#include <opencv2/core.hpp>
10+
#include <opencv2/gapi/gmetaarg.hpp>
11+
#include <opencv2/gapi/streaming/source.hpp>
1212

1313
class ImagesCapture;
1414
namespace cv {

demos/common/cpp_gapi/utils_gapi/src/stream_source.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
// Copyright (C) 2021 Intel Corporation
1+
// Copyright (C) 2021-2022 Intel Corporation
22
// SPDX-License-Identifier: Apache-2.0
33
//
44

55
#include "utils_gapi/stream_source.hpp"
66

7-
#include <opencv2/gapi/garg.hpp> // for Data
8-
#include <opencv2/gapi/gmat.hpp> // for GMatDesc, descr_of
9-
#include <opencv2/gapi/own/assert.hpp> // for GAPI_Assert
7+
#include <opencv2/gapi/garg.hpp>
8+
#include <opencv2/gapi/gmat.hpp>
9+
#include <opencv2/gapi/own/assert.hpp>
1010

11-
#include <utils/images_capture.h> // for ImagesCapture
11+
#include <utils/images_capture.h>
1212

1313
namespace custom {
1414
CommonCapSrc::CommonCapSrc(std::shared_ptr<ImagesCapture>& imagesCapture) : cap(imagesCapture) {

demos/face_detection_mtcnn_demo/cpp_gapi/face_detection_mtcnn_demo.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2021 Intel Corporation
1+
// Copyright (C) 2021-2022 Intel Corporation
22
// SPDX-License-Identifier: Apache-2.0
33
//
44

demos/face_detection_mtcnn_demo/cpp_gapi/include/custom_kernels.hpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
// Copyright (C) 2021 Intel Corporation
1+
// Copyright (C) 2021-2022 Intel Corporation
22
// SPDX-License-Identifier: Apache-2.0
33
//
44

55
#pragma once
66

7-
#include <stddef.h> // for size_t
7+
#include <stddef.h>
88

9-
#include <algorithm> // for max, min, sort
10-
#include <array> // for array
11-
#include <memory> // for allocator_traits<>::value_type
12-
#include <numeric> // for iota
13-
#include <tuple> // for tuple
14-
#include <vector> // for vector
9+
#include <algorithm>
10+
#include <array>
11+
#include <memory>
12+
#include <numeric>
13+
#include <tuple>
14+
#include <vector>
1515

16-
#include <opencv2/core.hpp> // for Rect, Size
17-
#include <opencv2/gapi/garray.hpp> // for empty_array_desc, GArrayDesc, GArray
18-
#include <opencv2/gapi/gkernel.hpp> // for G_API_OP, KernelTypeMedium, GKernelPackage
19-
#include <opencv2/gapi/gopaque.hpp> // for GOpaque, GOpaqueDesc (ptr only)
20-
#include <opencv2/gapi/render/render_types.hpp> // for Prim
16+
#include <opencv2/core.hpp>
17+
#include <opencv2/gapi/garray.hpp>
18+
#include <opencv2/gapi/gkernel.hpp>
19+
#include <opencv2/gapi/gopaque.hpp>
20+
#include <opencv2/gapi/render/render_types.hpp>
2121

2222
namespace cv {
2323
class GMat;

demos/face_detection_mtcnn_demo/cpp_gapi/include/utils.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2021 Intel Corporation
1+
// Copyright (C) 2021-2022 Intel Corporation
22
// SPDX-License-Identifier: Apache-2.0
33
//
44

0 commit comments

Comments
 (0)