CVS: rdesktop bitmap.c,1.26,1.27

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

Modified Files:
	bitmap.c 
Log Message:
remove old unused code and update email address

Index: bitmap.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/bitmap.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** bitmap.c	4 Jan 2007 05:39:38 -0000	1.26
--- bitmap.c	6 Jan 2007 22:21:20 -0000	1.27
***************
*** 19,28 ****
  */
  
! /* three seperate function for speed when decompressing the bitmaps */
! /* when modifing one function make the change in the others */
! /* comment out #define BITMAP_SPEED_OVER_SIZE below for one slower function */
! /* [email protected] */
! 
! #define BITMAP_SPEED_OVER_SIZE
  
  /* indent is confused by this file */
--- 19,25 ----
  */
  
! /* three seperate function for speed when decompressing the bitmaps
!    when modifing one function make the change in the others
!    [email protected] */
  
  /* indent is confused by this file */
***************
*** 67,72 ****
  }
  
- #ifdef BITMAP_SPEED_OVER_SIZE
- 
  /* 1 byte bitmap decompress */
  static BOOL
--- 64,67 ----
***************
*** 752,1003 ****
  }
  
- #else
- 
- static uint32
- cvalx(uint8 **input, int Bpp)
- {
- 	uint32 rv = 0;
- 	memcpy(&rv, *input, Bpp);
- 	*input += Bpp;
- 	return rv;
- }
- 
- static void
- setli(uint8 *input, int offset, uint32 value, int Bpp)
- {
- 	input += offset * Bpp;
- 	memcpy(input, &value, Bpp);
- }
- 
- static uint32
- getli(uint8 *input, int offset, int Bpp)
- {
- 	uint32 rv = 0;
- 	input += offset * Bpp;
- 	memcpy(&rv, input, Bpp);
- 	return rv;
- }
- 
- static BOOL
- bitmap_decompressx(uint8 *output, int width, int height, uint8 *input, int size, int Bpp)
- {
- 	uint8 *end = input + size;
- 	uint8 *prevline = NULL, *line = NULL;
- 	int opcode, count, offset, isfillormix, x = width;
- 	int lastopcode = -1, insertmix = False, bicolour = False;
- 	uint8 code;
- 	uint32 colour1 = 0, colour2 = 0;
- 	uint8 mixmask, mask = 0;
- 	uint32 mix = 0xffffffff;
- 	int fom_mask = 0;
- 
- 	while (input < end)
- 	{
- 		fom_mask = 0;
- 		code = CVAL(input);
- 		opcode = code >> 4;
- 
- 		/* Handle different opcode forms */
- 		switch (opcode)
- 		{
- 			case 0xc:
- 			case 0xd:
- 			case 0xe:
- 				opcode -= 6;
- 				count = code & 0xf;
- 				offset = 16;
- 				break;
- 
- 			case 0xf:
- 				opcode = code & 0xf;
- 				if (opcode < 9)
- 				{
- 					count = CVAL(input);
- 					count |= CVAL(input) << 8;
- 				}
- 				else
- 				{
- 					count = (opcode < 0xb) ? 8 : 1;
- 				}
- 				offset = 0;
- 				break;
- 
- 			default:
- 				opcode >>= 1;
- 				count = code & 0x1f;
- 				offset = 32;
- 				break;
- 		}
- 
- 		/* Handle strange cases for counts */
- 		if (offset != 0)
- 		{
- 			isfillormix = ((opcode == 2) || (opcode == 7));
- 
- 			if (count == 0)
- 			{
- 				if (isfillormix)
- 					count = CVAL(input) + 1;
- 				else
- 					count = CVAL(input) + offset;
- 			}
- 			else if (isfillormix)
- 			{
- 				count <<= 3;
- 			}
- 		}
- 
- 		/* Read preliminary data */
- 		switch (opcode)
- 		{
- 			case 0:	/* Fill */
- 				if ((lastopcode == opcode) && !((x == width) && (prevline == NULL)))
- 					insertmix = True;
- 				break;
- 			case 8:	/* Bicolour */
- 				colour1 = cvalx(&input, Bpp);
- 			case 3:	/* Colour */
- 				colour2 = cvalx(&input, Bpp);
- 				break;
- 			case 6:	/* SetMix/Mix */
- 			case 7:	/* SetMix/FillOrMix */
- 				mix = cvalx(&input, Bpp);
- 				opcode -= 5;
- 				break;
- 			case 9:	/* FillOrMix_1 */
- 				mask = 0x03;
- 				opcode = 0x02;
- 				fom_mask = 3;
- 				break;
- 			case 0x0a:	/* FillOrMix_2 */
- 				mask = 0x05;
- 				opcode = 0x02;
- 				fom_mask = 5;
- 				break;
- 
- 		}
- 
- 		lastopcode = opcode;
- 		mixmask = 0;
- 
- 		/* Output body */
- 		while (count > 0)
- 		{
- 			if (x >= width)
- 			{
- 				if (height <= 0)
- 					return False;
- 
- 				x = 0;
- 				height--;
- 
- 				prevline = line;
- 				line = output + height * width * Bpp;
- 			}
- 
- 			switch (opcode)
- 			{
- 				case 0:	/* Fill */
- 					if (insertmix)
- 					{
- 						if (prevline == NULL)
- 							setli(line, x, mix, Bpp);
- 						else
- 							setli(line, x,
- 							      getli(prevline, x, Bpp) ^ mix, Bpp);
- 
- 						insertmix = False;
- 						count--;
- 						x++;
- 					}
- 
- 					if (prevline == NULL)
- 					{
- 					REPEAT(setli(line, x, 0, Bpp))}
- 					else
- 					{
- 						REPEAT(setli
- 						       (line, x, getli(prevline, x, Bpp), Bpp));
- 					}
- 					break;
- 
- 				case 1:	/* Mix */
- 					if (prevline == NULL)
- 					{
- 						REPEAT(setli(line, x, mix, Bpp));
- 					}
- 					else
- 					{
- 						REPEAT(setli
- 						       (line, x, getli(prevline, x, Bpp) ^ mix,
- 							Bpp));
- 					}
- 					break;
- 
- 				case 2:	/* Fill or Mix */
- 					if (prevline == NULL)
- 					{
- 						REPEAT(MASK_UPDATE();
- 						       if (mask & mixmask) setli(line, x, mix, Bpp);
- 						       else
- 						       setli(line, x, 0, Bpp););
- 					}
- 					else
- 					{
- 						REPEAT(MASK_UPDATE();
- 						       if (mask & mixmask)
- 						       setli(line, x, getli(prevline, x, Bpp) ^ mix,
- 							     Bpp);
- 						       else
- 						       setli(line, x, getli(prevline, x, Bpp),
- 							     Bpp););
- 					}
- 					break;
- 
- 				case 3:	/* Colour */
- 					REPEAT(setli(line, x, colour2, Bpp));
- 					break;
- 
- 				case 4:	/* Copy */
- 					REPEAT(setli(line, x, cvalx(&input, Bpp), Bpp));
- 					break;
- 
- 				case 8:	/* Bicolour */
- 					REPEAT(if (bicolour)
- 					       {
- 					       setli(line, x, colour2, Bpp); bicolour = False;}
- 					       else
- 					       {
- 					       setli(line, x, colour1, Bpp); bicolour = True;
- 					       count++;}
- 					);
- 					break;
- 
- 				case 0xd:	/* White */
- 					REPEAT(setli(line, x, 0xffffffff, Bpp));
- 					break;
- 
- 				case 0xe:	/* Black */
- 					REPEAT(setli(line, x, 0, Bpp));
- 					break;
- 
- 				default:
- 					unimpl("bitmap opcode 0x%x\n", opcode);
- 					return False;
- 			}
- 		}
- 	}
- 
- 	return True;
- }
- 
- #endif
- 
  /* main decompress function */
  BOOL
  bitmap_decompress(uint8 * output, int width, int height, uint8 * input, int size, int Bpp)
  {
- #ifdef BITMAP_SPEED_OVER_SIZE
  	BOOL rv = False;
  	switch (Bpp)
  	{
--- 747,756 ----
  }
  
  /* main decompress function */
  BOOL
  bitmap_decompress(uint8 * output, int width, int height, uint8 * input, int size, int Bpp)
  {
  	BOOL rv = False;
+ 
  	switch (Bpp)
  	{
***************
*** 1012,1019 ****
  			break;
  	}
- #else
- 	BOOL rv;
-   rv = bitmap_decompressx(output, width, height, input, size, Bpp);
- #endif
  	return rv;
  }
--- 765,768 ----


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV