mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fonts: Fix clang compiling warning & error with freetype + lunasvg (#6873, #6842, #6591) 

Amend d6360c1
This commit is contained in:
DKing 2023-09-29 01:33:27 +08:00 committed by GitHub
parent 03e2a7f584
commit 701a047ac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/freetype/imgui_freetype.cpp
View File

@ -63,8 +63,10 @@
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind #pragma GCC diagnostic ignored "-Wpragmas" // warning: unknown option after '#pragma GCC diagnostic' kind
#pragma GCC diagnostic ignored "-Wunused-function" // warning: 'xxxx' defined but not used #pragma GCC diagnostic ignored "-Wunused-function" // warning: 'xxxx' defined but not used
#ifndef __clang__
#pragma GCC diagnostic ignored "-Wsubobject-linkage" // warning: 'xxxx' has a field 'xxxx' whose type uses the anonymous namespace #pragma GCC diagnostic ignored "-Wsubobject-linkage" // warning: 'xxxx' has a field 'xxxx' whose type uses the anonymous namespace
#endif #endif
#endif
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// Data // Data
@ -840,7 +842,7 @@ static FT_Error ImGuiLunasvgPortInit(FT_Pointer* _state)
static void ImGuiLunasvgPortFree(FT_Pointer* _state) static void ImGuiLunasvgPortFree(FT_Pointer* _state)
{ {
IM_DELETE(*(LunasvgPortState*)_state); IM_DELETE(*(LunasvgPortState**)_state);
} }
static FT_Error ImGuiLunasvgPortRender(FT_GlyphSlot slot, FT_Pointer* _state) static FT_Error ImGuiLunasvgPortRender(FT_GlyphSlot slot, FT_Pointer* _state)