projects
/
platform
/
upstream
/
efl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9cc7e69
)
Evas font: Change font fallback to not depend on fontconfig >= 2.11.
author
Tom Hacohen
<tom@stosb.com>
Wed, 5 Feb 2014 13:54:41 +0000
(13:54 +0000)
committer
Tom Hacohen
<tom@stosb.com>
Wed, 5 Feb 2014 13:54:41 +0000
(13:54 +0000)
Apparently, it was available for quite a while. It's just a case of confusing documentation
that made me think the minimum version is 2.11.
src/lib/evas/canvas/evas_font_dir.c
patch
|
blob
|
history
diff --git
a/src/lib/evas/canvas/evas_font_dir.c
b/src/lib/evas/canvas/evas_font_dir.c
index 393f9546bca31c25c45a6df65367c7556448e47f..00a12495e182e7ebdb7fa47bbe5bad7a8169a413 100644
(file)
--- a/
src/lib/evas/canvas/evas_font_dir.c
+++ b/
src/lib/evas/canvas/evas_font_dir.c
@@
-786,7
+786,6
@@
evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
}
else /* Add a fallback list from fontconfig according to the found font. */
{
-#if FC_MAJOR >= 2 && FC_MINOR >= 11
FcResult res;
FT_Face face = evas_common_font_freetype_face_get((RGBA_Font *) font);
@@
-809,7
+808,6
@@
evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
font = _evas_load_fontconfig(font, evas->evas, set, size, wanted_rend);
}
}
-#endif
}
#endif