0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixup 7ca648d0dd

Browse source 
is_valid_font_file was only used if CAIRO_HAS_WIN32_FONT was defined, so it was
triggering -Werror=unused-function on some compilers.
This commit is contained in:
Charles Dang 2018-02-14 15:27:36 +11:00
parent ec03dfcd08
commit f4b973b0c6
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/font/font_config.cpp
View file

@ -97,6 +97,7 @@ bool add_font_to_fontlist(const config &fonts_config,
return true;
}
#ifdef CAIRO_HAS_WIN32_FONT
bool is_valid_font_file(const std::string& file)
{
static const std::array<std::string, 3> font_exts { ".ttf", ".ttc", ".otf" };
@ -109,6 +110,7 @@ bool is_valid_font_file(const std::string& file)
return false;
}
#endif
// Current font family for sanserif and monospace fonts in the game
@ -239,7 +241,7 @@ manager::manager()
}
#endif
#if CAIRO_HAS_WIN32_FONT
#ifdef CAIRO_HAS_WIN32_FONT
for(const std::string& path : filesystem::get_binary_paths("fonts")) {
std::vector<std::string> files;
if(filesystem::is_directory(path)) {
@ -262,7 +264,7 @@ manager::~manager()
FcConfigAppFontClear(FcConfigGetCurrent());
#endif
#if CAIRO_HAS_WIN32_FONT
#ifdef CAIRO_HAS_WIN32_FONT
for(const std::string& path : filesystem::get_binary_paths("fonts")) {
std::vector<std::string> files;
if(filesystem::is_directory(path))