[Mplayer-cvslog] CVS: main/Gui/skin font.c,1.7,1.8

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/skin
In directory mail:/var/tmp.root/cvs-serv15597/Gui/skin

Modified Files:
	font.c 
Log Message:
applied 64bit patch from Ulrich Hecht <uli at suse.de>

Index: font.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/skin/font.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- font.c	20 May 2002 13:39:23 -0000	1.7
+++ font.c	23 May 2002 14:46:07 -0000	1.8
@@ -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 	 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 @@
  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 @@
    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++ )