notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

support OpenType fonts too

Browse source
This commit is contained in:
Albert Cahalan 2005-01-06 05:37:21 +00:00
parent 4c136a0dac
commit d02db87871
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/tuxpaint.c
View file

@ -1679,7 +1679,8 @@ static void parse_font_style(style_info *si)
else else
si->boldness = 1; si->boldness = 1;
si->truetype = !!strstr(si->filename,".ttf"); // we'll count both TrueType and OpenType
si->truetype = !!strstr(si->filename,".ttf") || !!strstr(si->filename,".otf");
} }
static void groupfonts_range(style_info **base, int count) static void groupfonts_range(style_info **base, int count)
@ -14111,9 +14112,10 @@ static void loadfonts(const char * const dir, int fatal)
if (S_ISDIR(sbuf.st_mode)) if (S_ISDIR(sbuf.st_mode))
loadfonts(fname,fatal); loadfonts(fname,fatal);
// Loadable: TrueType (.ttf), Type1 (.pfa and .pfb), and various useless bitmap fonts. // Loadable: TrueType (.ttf), OpenType (.otf), Type1 (.pfa and .pfb),
// Compressed files (with .gz or .bz2) might also work. // and various useless bitmap fonts. Compressed files (with .gz or .bz2)
if (strstr(d_names[i], ".ttf") || strstr(d_names[i], ".pfa") || strstr(d_names[i], ".pfb")) // should also work.
if (strstr(d_names[i], ".ttf") || strstr(d_names[i], ".otf") || strstr(d_names[i], ".pfa") || strstr(d_names[i], ".pfb"))
{ {
//printf("Loading font: %s/%s\n", dir, d_names[i]); //printf("Loading font: %s/%s\n", dir, d_names[i]);
TTF_Font *font = TTF_OpenFont(fname, text_sizes[text_size]); TTF_Font *font = TTF_OpenFont(fname, text_sizes[text_size]);