comparison 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
comparison
equal deleted inserted replaced
52:15a18fbe6f21 53:ddbcbd000206
509 509
510 TextGlyphStream HorizLayout::Layout(const char* str, int width, int r, int gc, int b) { 510 TextGlyphStream HorizLayout::Layout(const char* str, int width, int r, int gc, int b) {
511 TextStream s; 511 TextStream s;
512 s.SetColor(r,gc,b); 512 s.SetColor(r,gc,b);
513 s.Add(str); 513 s.Add(str);
514 return Layout(s, width);
515 }
516
517 TextGlyphStream HorizLayout::Layout(TextStream s, int width) {
514 TextGlyphStream g; 518 TextGlyphStream g;
515 vector<int> h; 519 vector<int> h;
516 Layout(s, g, h, width); 520 Layout(s, g, h, width);
517 return g; 521 return g;
518 } 522 }