diff options
| -rw-r--r-- | misc/fonts/cetus-16.xinefont.gz | bin | 6401 -> 5995 bytes | |||
| -rw-r--r-- | misc/fonts/cetus-20.xinefont.gz | bin | 8777 -> 8262 bytes | |||
| -rw-r--r-- | misc/fonts/cetus-24.xinefont.gz | bin | 11739 -> 10938 bytes | |||
| -rw-r--r-- | misc/fonts/cetus-32.xinefont.gz | bin | 16671 -> 15141 bytes | |||
| -rw-r--r-- | misc/fonts/mono-16.xinefont.gz | bin | 6126 -> 4341 bytes | |||
| -rw-r--r-- | misc/fonts/mono-20.xinefont.gz | bin | 8689 -> 6211 bytes | |||
| -rw-r--r-- | misc/fonts/mono-24.xinefont.gz | bin | 11320 -> 7789 bytes | |||
| -rw-r--r-- | misc/fonts/mono-32.xinefont.gz | bin | 16035 -> 11645 bytes | |||
| -rw-r--r-- | misc/fonts/sans-16.xinefont.gz | bin | 5969 -> 4989 bytes | |||
| -rw-r--r-- | misc/fonts/sans-20.xinefont.gz | bin | 8302 -> 7080 bytes | |||
| -rw-r--r-- | misc/fonts/sans-24.xinefont.gz | bin | 10918 -> 8660 bytes | |||
| -rw-r--r-- | misc/fonts/sans-32.xinefont.gz | bin | 15609 -> 13279 bytes | |||
| -rw-r--r-- | misc/fonts/serif-16.xinefont.gz | bin | 6393 -> 4975 bytes | |||
| -rw-r--r-- | misc/fonts/serif-20.xinefont.gz | bin | 8758 -> 7097 bytes | |||
| -rw-r--r-- | misc/fonts/serif-24.xinefont.gz | bin | 11200 -> 9121 bytes | |||
| -rw-r--r-- | misc/fonts/serif-32.xinefont.gz | bin | 17365 -> 13882 bytes | |||
| -rw-r--r-- | misc/xine-fontconv.c | 29 |
17 files changed, 18 insertions, 11 deletions
diff --git a/misc/fonts/cetus-16.xinefont.gz b/misc/fonts/cetus-16.xinefont.gz Binary files differindex ffa62e443..fba19ca94 100644 --- a/misc/fonts/cetus-16.xinefont.gz +++ b/misc/fonts/cetus-16.xinefont.gz diff --git a/misc/fonts/cetus-20.xinefont.gz b/misc/fonts/cetus-20.xinefont.gz Binary files differindex f52fad39e..e6150285a 100644 --- a/misc/fonts/cetus-20.xinefont.gz +++ b/misc/fonts/cetus-20.xinefont.gz diff --git a/misc/fonts/cetus-24.xinefont.gz b/misc/fonts/cetus-24.xinefont.gz Binary files differindex ec48cb37c..10935f07b 100644 --- a/misc/fonts/cetus-24.xinefont.gz +++ b/misc/fonts/cetus-24.xinefont.gz diff --git a/misc/fonts/cetus-32.xinefont.gz b/misc/fonts/cetus-32.xinefont.gz Binary files differindex aa3122ab6..01a6888f7 100644 --- a/misc/fonts/cetus-32.xinefont.gz +++ b/misc/fonts/cetus-32.xinefont.gz diff --git a/misc/fonts/mono-16.xinefont.gz b/misc/fonts/mono-16.xinefont.gz Binary files differindex fe6033585..219c89156 100644 --- a/misc/fonts/mono-16.xinefont.gz +++ b/misc/fonts/mono-16.xinefont.gz diff --git a/misc/fonts/mono-20.xinefont.gz b/misc/fonts/mono-20.xinefont.gz Binary files differindex 51fc93ed6..f3ec154d7 100644 --- a/misc/fonts/mono-20.xinefont.gz +++ b/misc/fonts/mono-20.xinefont.gz diff --git a/misc/fonts/mono-24.xinefont.gz b/misc/fonts/mono-24.xinefont.gz Binary files differindex e096f22ef..7b02f4e61 100644 --- a/misc/fonts/mono-24.xinefont.gz +++ b/misc/fonts/mono-24.xinefont.gz diff --git a/misc/fonts/mono-32.xinefont.gz b/misc/fonts/mono-32.xinefont.gz Binary files differindex 3eb4ac0c2..2181016d7 100644 --- a/misc/fonts/mono-32.xinefont.gz +++ b/misc/fonts/mono-32.xinefont.gz diff --git a/misc/fonts/sans-16.xinefont.gz b/misc/fonts/sans-16.xinefont.gz Binary files differindex d1a97a63e..d713f57ab 100644 --- a/misc/fonts/sans-16.xinefont.gz +++ b/misc/fonts/sans-16.xinefont.gz diff --git a/misc/fonts/sans-20.xinefont.gz b/misc/fonts/sans-20.xinefont.gz Binary files differindex eccdfbba8..177dab1ec 100644 --- a/misc/fonts/sans-20.xinefont.gz +++ b/misc/fonts/sans-20.xinefont.gz diff --git a/misc/fonts/sans-24.xinefont.gz b/misc/fonts/sans-24.xinefont.gz Binary files differindex 69f9ac09b..c6c71a4b9 100644 --- a/misc/fonts/sans-24.xinefont.gz +++ b/misc/fonts/sans-24.xinefont.gz diff --git a/misc/fonts/sans-32.xinefont.gz b/misc/fonts/sans-32.xinefont.gz Binary files differindex f43fdcf26..d107d8007 100644 --- a/misc/fonts/sans-32.xinefont.gz +++ b/misc/fonts/sans-32.xinefont.gz diff --git a/misc/fonts/serif-16.xinefont.gz b/misc/fonts/serif-16.xinefont.gz Binary files differindex d190fc4f8..f2aef91c5 100644 --- a/misc/fonts/serif-16.xinefont.gz +++ b/misc/fonts/serif-16.xinefont.gz diff --git a/misc/fonts/serif-20.xinefont.gz b/misc/fonts/serif-20.xinefont.gz Binary files differindex 4465a3638..36a714c86 100644 --- a/misc/fonts/serif-20.xinefont.gz +++ b/misc/fonts/serif-20.xinefont.gz diff --git a/misc/fonts/serif-24.xinefont.gz b/misc/fonts/serif-24.xinefont.gz Binary files differindex bd157a082..699721d2a 100644 --- a/misc/fonts/serif-24.xinefont.gz +++ b/misc/fonts/serif-24.xinefont.gz diff --git a/misc/fonts/serif-32.xinefont.gz b/misc/fonts/serif-32.xinefont.gz Binary files differindex 83ce71a1a..912e22b62 100644 --- a/misc/fonts/serif-32.xinefont.gz +++ b/misc/fonts/serif-32.xinefont.gz diff --git a/misc/xine-fontconv.c b/misc/xine-fontconv.c index d3fe7ff3e..cfedab180 100644 --- a/misc/xine-fontconv.c +++ b/misc/xine-fontconv.c @@ -205,6 +205,7 @@ void render_font (FT_Face face, char *fontname, int size, int thickness) { FT_Vector origin; int max_bearing_y = 0; int c, i; + int converted; static int border_pos[9][2] = { {-1,0},{1,0},{0,-1},{0,1}, @@ -275,6 +276,8 @@ void render_font (FT_Face face, char *fontname, int size, int thickness) { gzwrite (fp, &font, 40+6); for (c = 32; c < 256; c++) { + converted = 0; + for( i=0; i < 9; i++ ) { glyph_index = FT_Get_Char_Index( face, c ); @@ -311,24 +314,28 @@ void render_font (FT_Face face, char *fontname, int size, int thickness) { else add_final_bitmap( out_bitmap, &glyph_bitmap->bitmap, glyph_bitmap->left, max_bearing_y - glyph_bitmap->top ); - + converted = 1; + FT_Done_Glyph( glyph ); } } } - printf("[%c:%d] bitmap width: %d height: %d\n", c, c, out_bitmap->width, out_bitmap->rows ); - /* - print_bitmap(out_bitmap); - */ - fontchar.code = c; - fontchar.width = out_bitmap->width; - fontchar.height = out_bitmap->rows; - gzwrite (fp, &fontchar,6); - gzwrite (fp, out_bitmap->buffer, out_bitmap->width*out_bitmap->rows); + + if( converted ) { + printf("[%c:%d] bitmap width: %d height: %d\n", c, c, out_bitmap->width, out_bitmap->rows ); + /* + print_bitmap(out_bitmap); + */ + fontchar.code = c; + fontchar.width = out_bitmap->width; + fontchar.height = out_bitmap->rows; + gzwrite (fp, &fontchar,6); + gzwrite (fp, out_bitmap->buffer, out_bitmap->width*out_bitmap->rows); + } } gzclose(fp); - printf ("generated %s\n", filename); + printf ("generated %s (%d)\n", filename, font.num_fontchars); } int main(int argc, char *argv[]) { |