From: <dg...@us...> - 2007-01-18 01:08:14
|
Update of /cvsroot/xine/xine-ui/src/xitk/xine-toolkit In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25135 Modified Files: font.c Log Message: Fix unsigned/signed char mismatch at Xft functions' calls. Index: font.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/xine-toolkit/font.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- font.c 31 Dec 2006 21:58:10 -0000 1.45 +++ font.c 18 Jan 2007 01:08:13 -0000 1.46 @@ -850,7 +850,7 @@ xr_color.alpha = (short)-1; xft_draw = XftDrawCreate(xtfs->display, pix, visual, colormap); XftColorAllocValue(xtfs->display, visual, colormap, &xr_color, &xcolor); - XftDrawStringUtf8(xft_draw, &xcolor, xtfs->font, x, y, encoded_text, strlen(encoded_text)); + XftDrawStringUtf8(xft_draw, &xcolor, xtfs->font, x, y, (FcChar8*)encoded_text, strlen(encoded_text)); XftColorFree(xtfs->display, visual, colormap, &xcolor); XftDrawDestroy(xft_draw); @@ -1104,7 +1104,7 @@ free(foo_text); XLOCK(xtfs->display); - XftTextExtentsUtf8(xtfs->display, xtfs->font, encoded_text, nbytes, &xft_extents); + XftTextExtentsUtf8(xtfs->display, xtfs->font, (FcChar8*)encoded_text, nbytes, &xft_extents); XUNLOCK(xtfs->display); free(encoded_text); |