[Scummvm-cvs-logs] CVS: scummvm 2xsai.cpp,1.1,1.2

Ludvig Strigeus strigeus at users.sourceforge.net
Thu Apr 18 01:35:03 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv32260

Modified Files:
	2xsai.cpp 
Log Message:
Fixed endian problems with 2xsai


Index: 2xsai.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/2xsai.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 2xsai.cpp	12 Apr 2002 10:35:29 -0000	1.1
--- 2xsai.cpp	18 Apr 2002 08:34:47 -0000	1.2
***************
*** 257,263 ****
--- 257,269 ----
  					product1a = color5;
  
+ #ifdef SCUMM_LITTLE_ENDIAN
  				product1a = product1a | (product1b << 16);
  				product2a = product2a | (product2b << 16);
+ #endif
  
+ #ifdef SCUMM_BIG_ENDIAN
+ 				product1a = product1b | (product1a << 16);
+ 				product2a = product2b | (product2a << 16);
+ #endif
  				*((uint32 *)dP) = product1a;
  				*((uint32 *)(dP + dstPitch)) = product2a;
***************
*** 371,377 ****
--- 377,389 ----
  					product1b = Q_INTERPOLATE(color6, color6, color6, product1b);
  				}
+ #ifdef SCUMM_LITTLE_ENDIAN
  				product1a = product1a | (product1b << 16);
  				product2a = product2a | (product2b << 16);
+ #endif
  
+ #ifdef SCUMM_BIG_ENDIAN
+ 				product1a = product1b | (product1a << 16);
+ 				product2a = product2b | (product2a << 16);
+ #endif
  				*((uint32 *)dP) = product1a;
  				*((uint32 *)(dP + dstPitch)) = product2a;
***************
*** 520,525 ****
--- 532,544 ----
  				}
  
+ #ifdef SCUMM_LITTLE_ENDIAN
  				product = colorA | (product << 16);
  				product1 = product1 | (product2 << 16);
+ #endif
+ 
+ #ifdef SCUMM_BIG_ENDIAN
+ 				product = (colorA<<16) | product;
+ 				product1 = (product1<<16) | product2;
+ #endif
  				*((int32 *) dP) = product;
  				*((uint32 *)(dP + dstPitch)) = product1;





More information about the Scummvm-git-logs mailing list