diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-20 13:39:23 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-20 13:39:23 +0000 |
commit | c7b919a1b9ed2ae2137cf12b996d6f0c0ff88ba4 (patch) | |
tree | 6069aeb0e3c3e2452dcb98c6b638318405022200 /Gui/bitmap.c | |
parent | fb6a3dbf6cce110f17bd2eaa6d1ef3e98a454f95 (diff) | |
download | mpv-c7b919a1b9ed2ae2137cf12b996d6f0c0ff88ba4.tar.bz2 mpv-c7b919a1b9ed2ae2137cf12b996d6f0c0ff88ba4.tar.xz |
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
Diffstat (limited to 'Gui/bitmap.c')
-rw-r--r-- | Gui/bitmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gui/bitmap.c b/Gui/bitmap.c index 25df75c80f..8e9c06a0c5 100644 --- a/Gui/bitmap.c +++ b/Gui/bitmap.c @@ -185,8 +185,8 @@ void Convert32to1( txSample * in,txSample * out,int adaptivlimit ) out->Image=(char *)calloc( 1,out->ImageSize ); if ( out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_STATUS,"nem van ram baze\n" ); { - int i,b,c=0; unsigned long * buf = NULL; unsigned char tmp = 0; int nothaveshape = 1; - buf=(unsigned long *)in->Image; + int i,b,c=0; unsigned int * buf = NULL; unsigned char tmp = 0; int nothaveshape = 1; + buf=(unsigned int *)in->Image; for ( b=0,i=0;i < (int)(out->Width * out->Height);i++ ) { if ( (int)buf[i] != adaptivlimit ) tmp=( tmp >> 1 )|128; @@ -209,8 +209,8 @@ void Convert1to32( txSample * in,txSample * out ) mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[c32to1] imagesize: %d\n",out->ImageSize ); if ( (int)out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_STATUS,"nem van ram baze\n" ); { - int i,b,c=0; unsigned long * buf = NULL; unsigned char tmp = 0; - buf=(unsigned long *)out->Image; + int i,b,c=0; unsigned int * buf = NULL; unsigned char tmp = 0; + buf=(unsigned int *)out->Image; for ( c=0,i=0;i < (int)(in->Width * in->Height / 8);i++ ) { tmp=in->Image[i]; |