mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-09-06 03:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fonts: fixed unused variable warning.

Browse Source
This commit is contained in:
ocornut
2025-04-17 16:47:54 +02:00
parent c43b138a69
commit eb650c468a
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
imgui_draw.cpp
View File

@@ -4330,10 +4330,9 @@ ImTextureRect* ImFontAtlasPackGetRect(ImFontAtlas* atlas, ImFontAtlasRectId id)
{ {
IM_ASSERT(id != ImFontAtlasRectId_Invalid); IM_ASSERT(id != ImFontAtlasRectId_Invalid);
int index_idx = ImFontAtlasRectId_GetIndex(id); int index_idx = ImFontAtlasRectId_GetIndex(id);
int generation = ImFontAtlasRectId_GetGeneration(id);
ImFontAtlasBuilder* builder = (ImFontAtlasBuilder*)atlas->Builder; ImFontAtlasBuilder* builder = (ImFontAtlasBuilder*)atlas->Builder;
ImFontAtlasRectEntry* index_entry = &builder->RectsIndex[index_idx]; ImFontAtlasRectEntry* index_entry = &builder->RectsIndex[index_idx];
IM_ASSERT(index_entry->Generation == generation); IM_ASSERT(index_entry->Generation == ImFontAtlasRectId_GetGeneration(id));
IM_ASSERT(index_entry->IsUsed); IM_ASSERT(index_entry->IsUsed);
return &builder->Rects[index_entry->TargetIndex]; return &builder->Rects[index_entry->TargetIndex];
} }
@@ -4345,12 +4344,11 @@ ImTextureRect* ImFontAtlasPackGetRectSafe(ImFontAtlas* atlas, ImFontAtlasRectId
if (id == ImFontAtlasRectId_Invalid) if (id == ImFontAtlasRectId_Invalid)
return NULL; return NULL;
int index_idx = ImFontAtlasRectId_GetIndex(id); int index_idx = ImFontAtlasRectId_GetIndex(id);
int generation = ImFontAtlasRectId_GetGeneration(id);
ImFontAtlasBuilder* builder = (ImFontAtlasBuilder*)atlas->Builder; ImFontAtlasBuilder* builder = (ImFontAtlasBuilder*)atlas->Builder;
if (index_idx >= builder->RectsIndex.Size) if (index_idx >= builder->RectsIndex.Size)
return NULL; return NULL;
ImFontAtlasRectEntry* index_entry = &builder->RectsIndex[index_idx]; ImFontAtlasRectEntry* index_entry = &builder->RectsIndex[index_idx];
if (index_entry->Generation != generation || !index_entry->IsUsed) if (index_entry->Generation != ImFontAtlasRectId_GetGeneration(id) || !index_entry->IsUsed)
return NULL; return NULL;
return &builder->Rects[index_entry->TargetIndex]; return &builder->Rects[index_entry->TargetIndex];
} }