diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-23 14:46:08 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-23 14:46:08 +0000 |
| commit | e3f6268be0ab0ea4a4898f72ae0f2aca798d7a1f (patch) | |
| tree | b9d4aedeff382a4315c4131b8200bb6fd50dd819 /Gui/skin | |
| parent | 5c7cdd2197f5b2bafd39c5d54bc0f882ee9977ca (diff) | |
| download | mpv-e3f6268be0ab0ea4a4898f72ae0f2aca798d7a1f.tar.bz2 mpv-e3f6268be0ab0ea4a4898f72ae0f2aca798d7a1f.tar.xz | |
applied 64bit patch from Ulrich Hecht <uli@suse.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6160 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/skin')
| -rw-r--r-- | Gui/skin/font.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Gui/skin/font.c b/Gui/skin/font.c index bace086e4a..7c1e70ba1f 100644 --- a/Gui/skin/font.c +++ b/Gui/skin/font.c @@ -3,6 +3,7 @@ #include <stdio.h> #include <stdarg.h> #include <string.h> +#include <stdint.h> #include "skin.h" #include "font.h" @@ -124,8 +125,8 @@ txSample * fntRender( int id,int px,int sx,char * fmt,... ) txSample tmp2; char p[512]; va_list ap; - unsigned int * ibuf; - unsigned int * obuf; + uint32_t * ibuf; + uint32_t * obuf; int i,x,y; int oy = 0, ox = 0, dx = 0; @@ -144,8 +145,8 @@ txSample * fntRender( int id,int px,int sx,char * fmt,... ) tmp->ImageSize=tmp->Width * tmp->Height * 4; if ( ( tmp->Image=malloc( tmp->ImageSize ) ) == NULL ) return NULL; - obuf=(unsigned int *)tmp->Image; - ibuf=(unsigned int *)Fonts[id]->Bitmap.Image; + obuf=(uint32_t *)tmp->Image; + ibuf=(uint32_t *)Fonts[id]->Bitmap.Image; for ( i=0;i < (int)strlen( p );i++ ) { char c = p[i]; @@ -163,8 +164,8 @@ txSample * fntRender( int id,int px,int sx,char * fmt,... ) tmp2.ImageSize=sx * tmp->Height * 4; if ( ( tmp2.Image=malloc( tmp2.ImageSize ) ) == NULL ) { free( tmp->Image ); return NULL; } - obuf=(unsigned int *)tmp->Image; - ibuf=(unsigned int *)tmp2.Image; + obuf=(uint32_t *)tmp->Image; + ibuf=(uint32_t *)tmp2.Image; oy=0; for ( y=0;y < tmp->Height;y++ ) |