summaryrefslogtreecommitdiff
path: root/graphtft
diff options
context:
space:
mode:
authorAndreas Brugger <brougs78@gmx.net>2006-11-19 16:58:14 +0100
committerThomas Günther <tom@toms-cafe.de>2009-06-03 03:35:58 +0200
commit74a5cc8e14900d48386e33cb576f154a6dd7e557 (patch)
treec7a90ba2fc5952558f6d4f528f94f8057f0d3ecd /graphtft
parent8d32cf88bbe5b69a2710029cdaa896470a0fe20c (diff)
downloadvdr-plugin-text2skin-74a5cc8e14900d48386e33cb576f154a6dd7e557.tar.gz
vdr-plugin-text2skin-74a5cc8e14900d48386e33cb576f154a6dd7e557.tar.bz2
2006-11-19: Version 1.1-cvs_ext-0.9 (vdr-text2skin-1.1-cvs_ext-0.9.diff)
- added a test-feature to search for reruns of a program and add the information to the extended epg-info (trigger DEVELOPMENT_FEATURES). This uses a service-interface of the epgsearch-plugin "Epgsearch-searchresults-v1.0" - the timer-conflicts are now checked with epgsearch (service-interface "Epgsearch-lastconflictinfo-v1.0", as it works more reliable and is supported by the plugin author - the extended epg-info and the recording-info are extended by AUX-Infos (configurable) there is also an option to strip known tags - the tab-widths are scaled for taking into account that different TT-Fonts have a different width than the default font from VDR - added tokens for signal-info: FrontendSTR, FrontendSNR, FrontendHasLock, FrontendHasSignal - changed token TimerConflict to TimerConflicts - added token PresentEventID for EPG-images - added tokens for recordings: RecordingFilename, RecordingPriority, RecordingLifetime - removed Text2skin.diff from the rotor-plugin
Diffstat (limited to 'graphtft')
-rw-r--r--graphtft/font.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/graphtft/font.c b/graphtft/font.c
index 7941b74..9cfa812 100644
--- a/graphtft/font.c
+++ b/graphtft/font.c
@@ -138,21 +138,22 @@ bool cGraphtftFont::Load(string Filename, string CacheName, int Size, int Langua
//Load the char
error = FT_Load_Glyph( _face, glyph_index, FT_LOAD_DEFAULT );
if ( error ) continue; /* ignore errors */
-
- // convert to a mono bitmap
- error = FT_Render_Glyph( _face->glyph, ft_render_mode_mono );
- if ( error ) continue;
// now, convert to vdr font data
int width = (_slot->metrics.horiAdvance / 64) + 1;
int bearingX = (_slot->metrics.horiBearingX / 64) +1;
width = (width > (int)sizeof(cFont::tPixelData) * 8) ? (((int)sizeof(cFont::tPixelData) * 8)-2) :width ;
- int top = _slot->bitmap_top;
- int y_off = Size - top;
font_data[(num_char_array*num_rows)+0]=width;
font_data[(num_char_array*num_rows)+1]=num_rows_global;
+ // convert to a mono bitmap
+ error = FT_Render_Glyph( _face->glyph, ft_render_mode_mono );
+ if ( error ) continue;
+
+ int top = _slot->bitmap_top;
+ int y_off = Size - top;
+
unsigned char *bmp = _slot->bitmap.buffer;
for (int y = 0; y < _slot->bitmap.rows; ++y , y_off++) {