CVS: rdesktop xwin.c,1.156,1.157

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

Modified Files:
	xwin.c 
Log Message:
only check g_xserver_be once in translate8toXX

Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -d -r1.156 -r1.157
*** xwin.c	13 Mar 2004 12:08:18 -0000	1.156
--- xwin.c	24 Mar 2004 18:16:58 -0000	1.157
***************
*** 241,255 ****
  	uint16 value;
  
! 	while (out < end)
  	{
! 		value = (uint16) g_colmap[*(data++)];
! 
! 		if (g_xserver_be)
  		{
  			*(out++) = value >> 8;
  			*(out++) = value;
  		}
! 		else
  		{
  			*(out++) = value;
  			*(out++) = value >> 8;
--- 241,258 ----
  	uint16 value;
  
! 	if (g_xserver_be)
  	{
! 		while (out < end)
  		{
+ 			value = (uint16) g_colmap[*(data++)];
  			*(out++) = value >> 8;
  			*(out++) = value;
  		}
! 	}
! 	else
! 	{
! 		while (out < end)
  		{
+ 			value = (uint16) g_colmap[*(data++)];
  			*(out++) = value;
  			*(out++) = value >> 8;
***************
*** 264,279 ****
  	uint32 value;
  
! 	while (out < end)
  	{
! 		value = g_colmap[*(data++)];
! 
! 		if (g_xserver_be)
  		{
  			*(out++) = value >> 16;
  			*(out++) = value >> 8;
  			*(out++) = value;
  		}
! 		else
  		{
  			*(out++) = value;
  			*(out++) = value >> 8;
--- 267,285 ----
  	uint32 value;
  
! 	if (g_xserver_be)
  	{
! 		while (out < end)
  		{
+ 			value = g_colmap[*(data++)];
  			*(out++) = value >> 16;
  			*(out++) = value >> 8;
  			*(out++) = value;
  		}
! 	}
! 	else
! 	{
! 		while (out < end)
  		{
+ 			value = g_colmap[*(data++)];
  			*(out++) = value;
  			*(out++) = value >> 8;
***************
*** 288,297 ****
  	uint32 value;
  
! 	while (out < end)
  	{
! 		value = g_colmap[*(data++)];
! 
! 		if (g_xserver_be)
  		{
  			*(out++) = value >> 24;
  			*(out++) = value >> 16;
--- 294,302 ----
  	uint32 value;
  
! 	if (g_xserver_be)
  	{
! 		while (out < end)
  		{
+ 			value = g_colmap[*(data++)];
  			*(out++) = value >> 24;
  			*(out++) = value >> 16;
***************
*** 299,304 ****
  			*(out++) = value;
  		}
! 		else
  		{
  			*(out++) = value;
  			*(out++) = value >> 8;
--- 304,313 ----
  			*(out++) = value;
  		}
! 	}
! 	else
! 	{
! 		while (out < end)
  		{
+ 			value = g_colmap[*(data++)];
  			*(out++) = value;
  			*(out++) = value >> 8;



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click