TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

text: fix compilation warnings with implicit int->char32_t cast

Browse Source
This commit is contained in:
rdb 2019-07-10 11:20:15 +02:00
parent 4bb31029f0
commit 11990833fe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/text/textAssembler.cxx
View File

@ -1843,10 +1843,10 @@ get_character_glyphs(int character, const TextProperties *properties,
// Maybe we should remap the character to something else--e.g. a small // Maybe we should remap the character to something else--e.g. a small
// capital. // capital.
const UnicodeLatinMap::Entry *map_entry = const UnicodeLatinMap::Entry *map_entry =
UnicodeLatinMap::look_up(character); UnicodeLatinMap::look_up((char32_t)character);
if (map_entry != nullptr) { if (map_entry != nullptr) {
if (properties->get_small_caps() && if (properties->get_small_caps() &&
map_entry->_toupper_character != character) { map_entry->_toupper_character != (char32_t)character) {
character = map_entry->_toupper_character; character = map_entry->_toupper_character;
map_entry = UnicodeLatinMap::look_up(character); map_entry = UnicodeLatinMap::look_up(character);
glyph_scale = properties->get_small_caps_scale(); glyph_scale = properties->get_small_caps_scale();
@ -1871,7 +1871,7 @@ get_character_glyphs(int character, const TextProperties *properties,
got_glyph = font->get_glyph(map_entry->_ascii_equiv, glyph); got_glyph = font->get_glyph(map_entry->_ascii_equiv, glyph);
} }
if (!got_glyph && map_entry->_toupper_character != character) { if (!got_glyph && map_entry->_toupper_character != (char32_t)character) {
// If we still couldn't find it, try the uppercase equivalent. // If we still couldn't find it, try the uppercase equivalent.
character = map_entry->_toupper_character; character = map_entry->_toupper_character;
map_entry = UnicodeLatinMap::look_up(character); map_entry = UnicodeLatinMap::look_up(character);