From c2bf59ca0cf08fcbe3e7c5e1609dc3ee6cfc9eb0 Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Thu, 16 Jul 2026 14:14:37 +0200 Subject: [PATCH] Do not include headers in cv namespace That creates some conflict on some windows platform with blaze. --- modules/imgproc/src/drawing_text.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/imgproc/src/drawing_text.cpp b/modules/imgproc/src/drawing_text.cpp index 981f86ec85..2976a5d7a8 100644 --- a/modules/imgproc/src/drawing_text.cpp +++ b/modules/imgproc/src/drawing_text.cpp @@ -42,9 +42,6 @@ #include #include "zlib.h" -namespace cv -{ - #ifdef HAVE_HARFBUZZ #include @@ -59,6 +56,9 @@ namespace cv ////////////////////////////////////////////////////////////////////////////////////// +namespace cv +{ + typedef struct BuiltinFontData { const uchar* gzdata;