[Mplayer-cvslog] CVS: main/Gui/mplayer menu.h,1.10,1.11 mw.h,1.57,1.58

[Zoltan Ponekker]

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

Modified Files:
	menu.h mw.h 
Log Message:
Gui and 64-bit issues patch from Gui and 64-bit issues

Index: menu.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/menu.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- menu.h	1 May 2002 09:28:51 -0000	1.10
+++ menu.h	20 May 2002 13:39:23 -0000	1.11
@@ -9,8 +9,8 @@
 
 void mplMenuDraw( wsParamDisplay )
 {
- unsigned long * buf = NULL;
- unsigned long * drw = NULL;
+ unsigned int * buf = NULL;
+ unsigned int * drw = NULL;
  int             x,y,tmp;
 
  if ( !appMPlayer.menuBase.Bitmap.Image ) return;
@@ -22,8 +22,8 @@
 // ---
    if ( mplMenuItem != -1 )
     {
-     buf=(unsigned long *)mplMenuDrawBuffer;
-     drw=(unsigned long *)appMPlayer.menuSelected.Bitmap.Image;
+     buf=(unsigned int *)mplMenuDrawBuffer;
+     drw=(unsigned int *)appMPlayer.menuSelected.Bitmap.Image;
      for ( y=appMPlayer.MenuItems[ mplMenuItem ].y; y < appMPlayer.MenuItems[ mplMenuItem ].y + appMPlayer.MenuItems[ mplMenuItem ].height; y++ )
        for ( x=appMPlayer.MenuItems[ mplMenuItem ].x; x < appMPlayer.MenuItems[ mplMenuItem ].x + appMPlayer.MenuItems[ mplMenuItem ].width; x++ )
          {

Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- mw.h	11 May 2002 14:57:31 -0000	1.57
+++ mw.h	20 May 2002 13:39:23 -0000	1.58
@@ -122,15 +122,15 @@
 inline void PutImage( txSample * bf,int x,int y,int max,int ofs )
 {
  int i=0,ix,iy;
- unsigned long * buf = NULL;
- unsigned long * drw = NULL;
- unsigned long   tmp;
+ unsigned int * buf = NULL;
+ unsigned int * drw = NULL;
+ unsigned int   tmp;
 
  if ( ( !bf )||( bf->Image == NULL ) ) return;
 
  i=( bf->Width * ( bf->Height / max ) ) * ofs;
- buf=(unsigned long *)mplDrawBuffer;
- drw=(unsigned long *)bf->Image;
+ buf=(unsigned int *)mplDrawBuffer;
+ drw=(unsigned int *)bf->Image;
 
  for ( iy=y;iy < (int)(y+bf->Height / max);iy++ )
   for ( ix=x;ix < (int)(x+bf->Width);ix++ )