griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: remove unused VChar::index

Browse Source 
Also use a uint for the character argument since there is no reason
to use a larger type than a 32 bit integer.
This commit is contained in:
Campbell Barton
2024-12-13 16:49:10 +11:00
parent c9886ca90a
commit c16f56c219
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/BKE_vfontdata.hh
View File

@@ -27,7 +27,6 @@ struct VFontData {
struct VChar {
ListBase nurbsbase;
unsigned int index;
float width;
};
@@ -40,5 +39,5 @@ struct VChar {
VFontData *BKE_vfontdata_from_freetypefont(PackedFile *pf);
VFontData *BKE_vfontdata_copy(const VFontData *vfont_src, int flag);
VChar *BKE_vfontdata_char_from_freetypefont(VFont *vfont, unsigned long character);
VChar *BKE_vfontdata_char_from_freetypefont(VFont *vfont, unsigned int character);
VChar *BKE_vfontdata_char_copy(const VChar *vchar_src);

5
source/blender/blenkernel/intern/vfontdata_freetype.cc
View File

@@ -75,7 +75,7 @@ VFontData *BKE_vfontdata_copy(const VFontData *vfont_src, const int /*flag*/)
return vfont_dst;
}
VChar *BKE_vfontdata_char_from_freetypefont(VFont *vfont, ulong character)
VChar *BKE_vfontdata_char_from_freetypefont(VFont *vfont, uint character)
{
if (!vfont) {
return nullptr;
@@ -107,7 +107,6 @@ VChar *BKE_vfontdata_char_from_freetypefont(VFont *vfont, ulong character)
}
VChar *che = (VChar *)MEM_callocN(sizeof(VChar), "objfnt_char");
che->index = character;
/* need to set a size for embolden, etc. */
BLF_size(font_id, 16);
@@ -115,7 +114,7 @@ VChar *BKE_vfontdata_char_from_freetypefont(VFont *vfont, ulong character)
che->width = BLF_character_to_curves(
font_id, character, &che->nurbsbase, vfont->data->scale, use_fallback);
BLI_ghash_insert(vfont->data->characters, POINTER_FROM_UINT(che->index), che);
BLI_ghash_insert(vfont->data->characters, POINTER_FROM_UINT(character), che);
BLF_unload_id(font_id);
return che;
}