Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed strict aliasing punning warning when generating the key of a glyph in Font.cpp. Fixes #1187

Browse Source
This commit is contained in:
binary1248 2018-03-21 22:14:06 +01:00 committed by Lukas Dürrenberger
parent 421e8bb812
commit 949e7aecae
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/SFML/Graphics/Font.cpp
View File

@ -61,6 +61,21 @@ namespace
void close(FT_Stream) void close(FT_Stream)
{ {
} }
// Helper to intepret memory as a specific type
template <typename T, typename U>
inline T reinterpret(const U& input)
{
T output;
std::memcpy(&output, &input, sizeof(U));
return output;
}
// Combine outline thickness, boldness and codepoint into a single 64-bit key
sf::Uint64 combine(float outlineThickness, bool bold, sf::Uint32 codePoint)
{
return (static_cast<sf::Uint64>(reinterpret<sf::Uint32>(outlineThickness)) << 32) | (static_cast<sf::Uint64>(bold) << 31) | codePoint;
}
} }
@ -332,9 +347,7 @@ const Glyph& Font::getGlyph(Uint32 codePoint, unsigned int characterSize, bool b
GlyphTable& glyphs = m_pages[characterSize].glyphs; GlyphTable& glyphs = m_pages[characterSize].glyphs;
// Build the key by combining the code point, bold flag, and outline thickness // Build the key by combining the code point, bold flag, and outline thickness
Uint64 key = (static_cast<Uint64>(*reinterpret_cast<Uint32*>(&outlineThickness)) << 32) Uint64 key = combine(outlineThickness, bold, codePoint);
| (static_cast<Uint64>(bold ? 1 : 0) << 31)
| static_cast<Uint64>(codePoint);
// Search the glyph into the cache // Search the glyph into the cache
GlyphTable::const_iterator it = glyphs.find(key); GlyphTable::const_iterator it = glyphs.find(key);