Mercurial > mplayer.hg
changeset 4848:ad868aae2a5c
fix playtree bug. but ... i dont' see this ... bazmeg
author | pontscho |
---|---|
date | Sun, 24 Feb 2002 19:34:52 +0000 |
parents | 75f2935e9984 |
children | 9be4ac85dd35 |
files | Gui/interface.h Gui/skin/font.c |
diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Gui/interface.h Sun Feb 24 18:31:14 2002 +0000 +++ b/Gui/interface.h Sun Feb 24 19:34:52 2002 +0000 @@ -100,8 +100,9 @@ extern void guiGetEvent( int type,char * arg ); extern void guiEventHandling( void ); -#define guiSetFilename( s,n ) \ - { if ( s ) free( s ); s=NULL; s=strdup( n ); } +#define gstrdup( s,ss ) { s=malloc( strlen( ss ) + 3 ); strcpy( s,ss ); } + +#define guiSetFilename( s,n ) { s=strdup( n ); } #define guiSetDF( s,d,n ) \ { \ @@ -110,4 +111,4 @@ sprintf( s,"%s/%s",d,n ); \ } -#endif \ No newline at end of file +#endif
--- a/Gui/skin/font.c Sun Feb 24 18:31:14 2002 +0000 +++ b/Gui/skin/font.c Sun Feb 24 19:34:52 2002 +0000 @@ -121,6 +121,7 @@ txSample * fntRender( int id,int px,int sx,char * fmt,... ) { txSample * tmp = NULL; + txSample tmp2; char p[512]; va_list ap; unsigned long * ibuf; @@ -147,7 +148,7 @@ ibuf=(unsigned long *)Fonts[id]->Bitmap.Image; for ( i=0;i < (int)strlen( p );i++ ) { - int c = (int)p[i]; + char c = p[i]; if ( Fonts[id]->Fnt[c].x == -1 ) c=32; for ( oy=0,y=Fonts[id]->Fnt[c].y;y < Fonts[id]->Fnt[c].y + Fonts[id]->Fnt[c].sy; y++,oy++ ) for ( ox=0,x=Fonts[id]->Fnt[c].x;x < Fonts[id]->Fnt[c].x + Fonts[id]->Fnt[c].sx; x++,ox++ ) @@ -159,7 +160,6 @@ if ( ( sx > 0 )&&( sx < tmp->Width ) ) { - txSample tmp2; tmp2.ImageSize=sx * tmp->Height * 4; if ( ( tmp2.Image=malloc( tmp2.ImageSize ) ) == NULL ) { free( tmp->Image ); return NULL; }