// Georgia
if (FT_New_Face(library, "/usr/share/fonts/truetype/msttcorefonts/Georgia.ttf", 0, &face))
throw std::runtime_error("Face opening failed.");
- if (FT_Set_Char_Size(face, 0, 12 * 64, 96, 96))
- throw std::runtime_error("Size set failed.");
fonts.push_back(face);
// FreeSerif
if (FT_New_Face(library, "/usr/share/fonts/truetype/freefont/FreeSerif.ttf", 0, &face)) {
std::fprintf(stderr, "Warning: Couldn't open FreeSerif, some glyphs might not be available\n");
} else {
- if (FT_Set_Char_Size(face, 0, 12 * 64, 96, 96))
- throw std::runtime_error("Size set failed.");
fonts.push_back(face);
}
if (FT_New_Face(library, "arialuni.ttf", 0, &face)) {
std::fprintf(stderr, "Warning: Couldn't open Arial Unicode MS, some glyphs might not be available\n");
} else {
- if (FT_Set_Char_Size(face, 0, 12 * 64, 96, 96))
- throw std::runtime_error("Size set failed.");
fonts.push_back(face);
}
}
-int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, bool real_render, int r, int g, int b)
+unsigned my_draw_text(const widestring &str, unsigned char *buf, double size, int xpos, int ypos, int r, int g, int b)
{
FT_GlyphSlot slot;
int x = 0;
+
+ for (std::vector<FT_Face>::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
+ if (FT_Set_Char_Size(*i, 0, unsigned(size * 64.0), 96, 96))
+ throw std::runtime_error("Couldn't set font size");
+ }
for (widestring::const_iterator i = str.begin(); i != str.end(); ++i) {
int glyph_index;
continue;
}
- if (real_render) {
+ if (buf != NULL) {
int y;
FT_Bitmap *bm = &(slot->bitmap);
for (y = 0; y < bm->rows; y++) {
unsigned char *dst = buf + dsty * 800*4 + (x + xpos + slot->bitmap_left)*4;
unsigned char *src = bm->buffer + y * bm->width;
- for (xx = 0; xx < bm->width; xx++) {
+
+ int width = (x + xpos + slot->bitmap_left + bm->width >= 800) ? (799 - x - xpos - slot->bitmap_left) : bm->width;
+ for (xx = 0; xx < width; xx++) {
*dst = (*dst * (256-*src) + r * *src) >> 8;
*dst++;
*dst = (*dst * (256-*src) + g * *src) >> 8;