CVS: rdesktop xwin.c,1.168,1.169

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28134

Modified Files:
	xwin.c 
Log Message:
fix for colourspace-expansion


Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -d -r1.168 -r1.169
*** xwin.c	11 May 2004 13:45:57 -0000	1.168
--- xwin.c	27 May 2004 10:19:41 -0000	1.169
***************
*** 173,179 ****
  {
  	PixelColour rv;
! 	rv.red = (colour & 0x7c00) >> 7;
! 	rv.green = (colour & 0x03e0) >> 2;
! 	rv.blue = (colour & 0x001f) << 3;
  	return rv;
  }
--- 173,179 ----
  {
  	PixelColour rv;
! 	rv.red = ((colour >> 7 ) & 0xf8) | ((colour >> 12) & 0x7);
! 	rv.green = ((colour >> 2) & 0xf8) | ((colour >> 8) & 0x7);
! 	rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2)  & 0x7);
  	return rv;
  }
***************
*** 183,189 ****
  {
  	PixelColour rv;
! 	rv.red = (colour & 0xf800) >> 8;
! 	rv.green = (colour & 0x07e0) >> 3;
! 	rv.blue = (colour & 0x001f) << 3;
  	return rv;
  }
--- 183,189 ----
  {
  	PixelColour rv;
! 	rv.red = ((colour >> 8 ) & 0xf8) | ((colour >> 13) & 0x7);
! 	rv.green = ((colour >> 3) & 0xfc) | ((colour >> 9) & 0x3);
! 	rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2)  & 0x7);
  	return rv;
  }



-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click