diff mbox

text2skin plugins & no OSD with libfreetype6 2.2

Message ID 1151743309.5037.10.camel@localhost.localdomain
State New
Headers

Commit Message

jlacvdr July 1, 2006, 8:41 a.m. UTC 
  Hi,

The attached patch file fix the text2skin plugin which doesn't display
OSD text when it's linking with libfreetype6 2.2

Best Regards,

Jerome

Comments

C.Y.M July 1, 2006, 12:11 p.m. UTC | #1 
On 7/1/06, jlacvdr <jlacvdr@jlac.dyndns.org> wrote:
>
> Hi,
>
> The attached patch file fix the text2skin plugin which doesn't display
> OSD text when it's linking with libfreetype6 2.2


Thank you very much.  This seems to fix it. :)

BR.
diff mbox

Patch

--- text2skin-1.0-orig/graphtft/font.c	2005-01-30 19:09:42.000000000 +0100
+++ text2skin/graphtft/font.c	2006-06-30 21:33:53.000000000 +0200
@@ -139,20 +139,21 @@ 
 		 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++) {