diff font/font_layout.cc @ 53:ddbcbd000206

* MuSys, AyuSysConfig, FileSearcher (former FILESEARCHER) and KeyHolder (former KEYHOLDER) are now singletons * ParseMoji moved to TextStream * Some cleaning (0 -> NULL when needed, removal of useless returns, ...)
author thib
date Sun, 19 Apr 2009 11:44:05 +0000
parents 15a18fbe6f21
children 4416cfac86ae
line wrap: on
line diff
--- a/font/font_layout.cc
+++ b/font/font_layout.cc
@@ -511,6 +511,10 @@ namespace XKFont {
 		TextStream s;
 		s.SetColor(r,gc,b);
 		s.Add(str);
+		return Layout(s, width);
+	}
+
+	TextGlyphStream HorizLayout::Layout(TextStream s, int width) {
 		TextGlyphStream g;
 		vector<int> h;
 		Layout(s, g, h, width);