From aaee24b75353c5fc4798d16c622cc422d2300e59 Mon Sep 17 00:00:00 2001 From: kallaballa Date: Mon, 10 Apr 2023 21:58:24 +0200 Subject: [PATCH] include util.hpp in viz2d.hpp --- modules/viz2d/include/opencv2/viz2d/viz2d.hpp | 1 + modules/viz2d/samples/cpp/beauty/beauty-demo.cpp | 1 - modules/viz2d/samples/cpp/font/font-demo.cpp | 1 - modules/viz2d/samples/cpp/nanovg/nanovg-demo.cpp | 1 - modules/viz2d/samples/cpp/optflow/optflow-demo.cpp | 1 - modules/viz2d/samples/cpp/shader/shader-demo.cpp | 1 - modules/viz2d/samples/cpp/tetra/tetra-demo.cpp | 1 - modules/viz2d/samples/cpp/video/video-demo.cpp | 1 - 8 files changed, 1 insertion(+), 7 deletions(-) diff --git a/modules/viz2d/include/opencv2/viz2d/viz2d.hpp b/modules/viz2d/include/opencv2/viz2d/viz2d.hpp index 585eda3bc..5ddd815e7 100644 --- a/modules/viz2d/include/opencv2/viz2d/viz2d.hpp +++ b/modules/viz2d/include/opencv2/viz2d/viz2d.hpp @@ -10,6 +10,7 @@ #include "sink.hpp" #include "dialog.hpp" #include "formhelper.hpp" +#include "util.hpp" #include #include #include diff --git a/modules/viz2d/samples/cpp/beauty/beauty-demo.cpp b/modules/viz2d/samples/cpp/beauty/beauty-demo.cpp index 2595d0a38..9001d4119 100644 --- a/modules/viz2d/samples/cpp/beauty/beauty-demo.cpp +++ b/modules/viz2d/samples/cpp/beauty/beauty-demo.cpp @@ -5,7 +5,6 @@ #include "opencv2/viz2d/viz2d.hpp" #include "opencv2/viz2d/nvg.hpp" -#include "opencv2/viz2d/util.hpp" #include #include diff --git a/modules/viz2d/samples/cpp/font/font-demo.cpp b/modules/viz2d/samples/cpp/font/font-demo.cpp index e55450d6e..45c3dc01e 100644 --- a/modules/viz2d/samples/cpp/font/font-demo.cpp +++ b/modules/viz2d/samples/cpp/font/font-demo.cpp @@ -5,7 +5,6 @@ #include "opencv2/viz2d/viz2d.hpp" #include "opencv2/viz2d/nvg.hpp" -#include "opencv2/viz2d/util.hpp" #include #include diff --git a/modules/viz2d/samples/cpp/nanovg/nanovg-demo.cpp b/modules/viz2d/samples/cpp/nanovg/nanovg-demo.cpp index 06e7eee9b..3d9543cc8 100644 --- a/modules/viz2d/samples/cpp/nanovg/nanovg-demo.cpp +++ b/modules/viz2d/samples/cpp/nanovg/nanovg-demo.cpp @@ -4,7 +4,6 @@ // Copyright Amir Hassan (kallaballa) #include "opencv2/viz2d/viz2d.hpp" -#include "opencv2/viz2d/util.hpp" #include "opencv2/viz2d/nvg.hpp" constexpr unsigned int WIDTH = 1920; diff --git a/modules/viz2d/samples/cpp/optflow/optflow-demo.cpp b/modules/viz2d/samples/cpp/optflow/optflow-demo.cpp index 5255d3733..7e10ea0d7 100644 --- a/modules/viz2d/samples/cpp/optflow/optflow-demo.cpp +++ b/modules/viz2d/samples/cpp/optflow/optflow-demo.cpp @@ -5,7 +5,6 @@ #include "opencv2/viz2d/viz2d.hpp" #include "opencv2/viz2d/nvg.hpp" -#include "opencv2/viz2d/util.hpp" #include #include diff --git a/modules/viz2d/samples/cpp/shader/shader-demo.cpp b/modules/viz2d/samples/cpp/shader/shader-demo.cpp index 293384964..1c5c89a32 100644 --- a/modules/viz2d/samples/cpp/shader/shader-demo.cpp +++ b/modules/viz2d/samples/cpp/shader/shader-demo.cpp @@ -4,7 +4,6 @@ // Copyright Amir Hassan (kallaballa) #include "opencv2/viz2d/viz2d.hpp" -#include "opencv2/viz2d/util.hpp" using std::cerr; using std::endl; diff --git a/modules/viz2d/samples/cpp/tetra/tetra-demo.cpp b/modules/viz2d/samples/cpp/tetra/tetra-demo.cpp index 1fed03fbb..175e7905e 100644 --- a/modules/viz2d/samples/cpp/tetra/tetra-demo.cpp +++ b/modules/viz2d/samples/cpp/tetra/tetra-demo.cpp @@ -4,7 +4,6 @@ // Copyright Amir Hassan (kallaballa) #include "opencv2/viz2d/viz2d.hpp" -#include "opencv2/viz2d/util.hpp" constexpr long unsigned int WIDTH = 1920; constexpr long unsigned int HEIGHT = 1080; diff --git a/modules/viz2d/samples/cpp/video/video-demo.cpp b/modules/viz2d/samples/cpp/video/video-demo.cpp index f5dcdeb09..1c24ff5bd 100644 --- a/modules/viz2d/samples/cpp/video/video-demo.cpp +++ b/modules/viz2d/samples/cpp/video/video-demo.cpp @@ -4,7 +4,6 @@ // Copyright Amir Hassan (kallaballa) #include "opencv2/viz2d/viz2d.hpp" -#include "opencv2/viz2d/util.hpp" #include