Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove some extra allocations. #621

Closed
wants to merge 1 commit into from
Closed

Remove some extra allocations. #621

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 14 additions & 24 deletions src/video/font.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
-- Variables
----------------------------------------------------------------------------*/

using FontMap = std::map<std::string, std::unique_ptr<CFont>, std::less<>>;
using FontMap = std::map<std::string, CFont, std::less<>>;
static FontMap Fonts; /// Font mappings

using FontColorMap = std::map<std::string, std::unique_ptr<CFontColor>, std::less<>>;
using FontColorMap = std::map<std::string, CFontColor, std::less<>>;
static FontColorMap FontColors; /// Map of ident to font color.

static const CFontColor *LastTextColor; /// Last text color
Expand Down Expand Up @@ -913,7 +913,7 @@ void CFont::DynamicLoad() const
void LoadFonts()
{
for (auto &[key, font] : Fonts) {
font->Load();
font.Load();
}

// TODO: remove this
Expand All @@ -931,16 +931,15 @@ void LoadFonts()
*/
/* static */ CFont *CFont::New(const std::string &ident, CGraphic *g)
{
auto &font = Fonts[ident];
if (font) {
if (font->G != g) {
CGraphic::Free(font->G);
auto &[it, inserted] = Fonts.insert({ident, CFont(ident)});
auto &[key, font] = *it;
if (!inserted) {
if (font.G != g) {
CGraphic::Free(font.G);
}
} else {
font.reset(new CFont(ident));
}
font->G = g;
return font.get();
font.G = g;
return &font;
}

/**
Expand All @@ -967,12 +966,7 @@ void LoadFonts()
ErrorPrint("font not found: '%s'\n", ident.data());
return nullptr;
}
auto &font = it->second;
if (font == nullptr) {
ErrorPrint("font not found: '%s'\n", ident.data());
return nullptr;
}
return font.get();
return &it->second;
}

/**
Expand All @@ -984,12 +978,8 @@ void LoadFonts()
*/
/* static */ CFontColor *CFontColor::New(const std::string &ident)
{
auto &fc = FontColors[ident];

if (fc == nullptr) {
fc = std::make_unique<CFontColor>(ident);
}
return fc.get();
auto [it, inserted] = FontColors.emplace(ident, ident);
return &it->second;
}

/**
Expand All @@ -1006,7 +996,7 @@ void LoadFonts()
ErrorPrint("font color not found: '%s'\n", ident.data());
ExitFatal(-1);
}
return it->second.get();
return &it->second;
}

/**
Expand Down
Loading