forked from enlightenment/efl
Evas font: Fixed compilation without fontconfig.
Thanks a lot to JaMa for reporting this. SVN revision: 74640
This commit is contained in:
parent
a2720ade35
commit
6dd9396d6f
|
@ -533,11 +533,13 @@ evas_font_load(Evas *evas, Evas_Font_Description *fdesc, const char *source, Eva
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_FONTCONFIG
|
||||||
if (found_fd)
|
if (found_fd)
|
||||||
{
|
{
|
||||||
font = evas_load_fontconfig(evas, found_fd->set, size, wanted_rend);
|
font = evas_load_fontconfig(evas, found_fd->set, size, wanted_rend);
|
||||||
goto on_find;
|
goto on_find;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
EINA_LIST_FOREACH(fonts_zero, l, fd)
|
EINA_LIST_FOREACH(fonts_zero, l, fd)
|
||||||
{
|
{
|
||||||
|
@ -564,11 +566,13 @@ evas_font_load(Evas *evas, Evas_Font_Description *fdesc, const char *source, Eva
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_FONTCONFIG
|
||||||
if (found_fd)
|
if (found_fd)
|
||||||
{
|
{
|
||||||
font = evas_load_fontconfig(evas, found_fd->set, size, wanted_rend);
|
font = evas_load_fontconfig(evas, found_fd->set, size, wanted_rend);
|
||||||
goto on_find;
|
goto on_find;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
fonts = evas_font_set_get(fdesc->name);
|
fonts = evas_font_set_get(fdesc->name);
|
||||||
EINA_LIST_FOREACH(fonts, l, nm) /* Load each font in append */
|
EINA_LIST_FOREACH(fonts, l, nm) /* Load each font in append */
|
||||||
|
|
Loading…
Reference in New Issue