[MPlayer-cvslog] r19209 - trunk/libvo/font_load_ft.c

[diego]

Author: diego
Date: Fri Jul 28 10:10:37 2006
New Revision: 19209

Modified:
   trunk/libvo/font_load_ft.c

Log:
Fixes the format string for the warning message on line 182 (%x
with long argument, %c with long argument).
Also, font_load_ft calls iconv with int pointers instead of size_t
pointers for (in|out)bytesleft.
patch by Tobias Diedrich, ranma ##at## tdiedrich ##dot## de


Modified: trunk/libvo/font_load_ft.c
==============================================================================
--- trunk/libvo/font_load_ft.c	(original)
+++ trunk/libvo/font_load_ft.c	Fri Jul 28 10:10:37 2006
@@ -179,8 +179,8 @@
 	else {
 	    glyph_index = FT_Get_Char_Index(face, uni_charmap ? character:code);
 	    if (glyph_index==0) {
-		WARNING("Glyph for char 0x%02x|U+%04X|%c not found.", code, character,
-			code<' '||code>255 ? '.':code);
+		WARNING("Glyph for char 0x%02lx|U+%04lX|%c not found.", code, character,
+			code<' '||code>255 ? '.':(char)code);
 		desc->font[unicode?character:code] = -1;
 		continue;
 	    }
@@ -737,8 +737,8 @@
     FT_ULong o;
     char *inbuf = &c;
     char *outbuf = (char*)&o;
-    int inbytesleft = 1;
-    int outbytesleft = sizeof(FT_ULong);
+    size_t inbytesleft = 1;
+    size_t outbytesleft = sizeof(FT_ULong);
 
     iconv(*cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);