mirror of
https://github.com/mpv-player/mpv
synced 2025-01-31 04:02:06 +00:00
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 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19209 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
74befbec2b
commit
0bdf40e5cc
@ -179,8 +179,8 @@ static int check_font(font_desc_t *desc, float ppem, int padding, int pic_idx,
|
||||
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 @@ static FT_ULong decode_char(iconv_t *cd, char c) {
|
||||
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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user