From 3a424b7f1c6d463cfa6a629eae1bf73e36b99b0f Mon Sep 17 00:00:00 2001 From: Kumataro Date: Tue, 3 Oct 2023 20:45:23 +0000 Subject: [PATCH] imgproc: move stb_trutype functions into cv namespace --- modules/imgproc/src/stb_truetype.cpp | 4 ++++ modules/imgproc/src/stb_truetype.hpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/imgproc/src/stb_truetype.cpp b/modules/imgproc/src/stb_truetype.cpp index 5a481aa1ce..334cab4b0c 100644 --- a/modules/imgproc/src/stb_truetype.cpp +++ b/modules/imgproc/src/stb_truetype.cpp @@ -403,6 +403,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifdef STB_TRUETYPE_IMPLEMENTATION +namespace cv { + #ifndef STBTT_MAX_OVERSAMPLE #define STBTT_MAX_OVERSAMPLE 8 #endif @@ -4428,6 +4430,8 @@ STBTT_DEF int stbtt_SetInstance(stbtt_fontinfo* info, const int* params, int cou #pragma GCC diagnostic pop #endif +} // namespace cv + #endif // STB_TRUETYPE_IMPLEMENTATION diff --git a/modules/imgproc/src/stb_truetype.hpp b/modules/imgproc/src/stb_truetype.hpp index e1224213c6..73edd150f8 100644 --- a/modules/imgproc/src/stb_truetype.hpp +++ b/modules/imgproc/src/stb_truetype.hpp @@ -72,7 +72,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #endif #ifdef __cplusplus -extern "C" { +namespace cv { #endif #define STBTT_FOURCC(a, b, c, d) \