mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-12 23:49:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24357 from Kumataro:fix24121

Browse Source 
imgproc: move stb_truetype functions into cv namespace
This commit is contained in:
Alexander Smorkalov 2023-10-05 09:37:08 +03:00 committed by GitHub
commit 0976765c62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/imgproc/src/stb_truetype.cpp
View File

@ -403,6 +403,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifdef STB_TRUETYPE_IMPLEMENTATION #ifdef STB_TRUETYPE_IMPLEMENTATION
namespace cv {
#ifndef STBTT_MAX_OVERSAMPLE #ifndef STBTT_MAX_OVERSAMPLE
#define STBTT_MAX_OVERSAMPLE 8 #define STBTT_MAX_OVERSAMPLE 8
#endif #endif
@ -4428,6 +4430,8 @@ STBTT_DEF int stbtt_SetInstance(stbtt_fontinfo* info, const int* params, int cou
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
} // namespace cv
#endif // STB_TRUETYPE_IMPLEMENTATION #endif // STB_TRUETYPE_IMPLEMENTATION

2
modules/imgproc/src/stb_truetype.hpp
View File

@ -72,7 +72,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { namespace cv {
#endif #endif
#define STBTT_FOURCC(a, b, c, d) \ #define STBTT_FOURCC(a, b, c, d) \