Gui and 64-bit issues patch from Gui and 64-bit issues

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6146 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 9 insertions, 9 deletions

diff --git a/Gui/mplayer/menu.h b/Gui/mplayer/menu.h
index 58a97bf469..5de6fda590 100644
--- a/Gui/mplayer/menu.h
+++ b/Gui/mplayer/menu.h
@@ -9,8 +9,8 @@ void mplHideMenu( int mx,int my,int w );
 
 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 @@ void mplMenuDraw( wsParamDisplay )
 // ---
    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++ )
          {
diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h
index b78fb30685..f9541e3bbb 100644
--- a/Gui/mplayer/mw.h
+++ b/Gui/mplayer/mw.h
@@ -122,15 +122,15 @@ calclengthmmmmss:
 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++ )