[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1634
Date       : Tue Aug  1 14:09:37 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/maskfilt.cpp

Fix and re-instate index background transparence support (BZ #1331)


Diff:
Index: Trunk/XaraLX/wxOil/maskfilt.cpp
===================================================================
--- Trunk/XaraLX/wxOil/maskfilt.cpp	(revision 1633)
+++ Trunk/XaraLX/wxOil/maskfilt.cpp	(revision 1634)
@@ -811,7 +811,7 @@
 		{
 			// Get the current Byte of BMP Data at the current Position
 //			ByteData = _rotr(pBMPBits[PixelPos],8);
-			ByteData = pBMPBits[PixelPos]>>8 || pBMPBits[PixelPos]<<24;
+			ByteData = pBMPBits[PixelPos]>>8 | pBMPBits[PixelPos]<<24;
 
 			NumOfSubPixels = PixelsPerByte;
 
@@ -822,7 +822,7 @@
 			for(SubPixPos = 0; SubPixPos < PixelsPerByte; SubPixPos++)
 			{
 //				ByteData = _rotl(ByteData,Depth);
-				ByteData = ByteData<<8 || ByteData>>24;
+				ByteData = ByteData<<8 | ByteData>>24;
 				Padding = (SubPixPos >= NumOfSubPixels);
 
 				// First check to see if the alpha channel is fully transparent


Xara