[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1337
Date       : Sat Jun 17 18:33:21 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/group.cpp
   M /Trunk/XaraLX/Kernel/view.cpp

Fix printing/EPS rendering of group transparency


Diff:
Index: Trunk/XaraLX/Kernel/group.cpp
===================================================================
--- Trunk/XaraLX/Kernel/group.cpp	(revision 1336)
+++ Trunk/XaraLX/Kernel/group.cpp	(revision 1337)
@@ -130,7 +130,7 @@
 //#include "dibutil.h" - in camtypes.h [AUTOMATICALLY REMOVED]
 #include "nodeliveeffect.h"
 #include "scanrr.h"
-//#include "pmaskrgn.h"
+#include "pmaskrgn.h"
 #include "blndhelp.h"
 //#include "mrhbits.h"
 #include "transop.h"
@@ -574,11 +574,8 @@
 			cbmp.nPriority = CACHEPRIORITY_TEMPBITMAP_HIGH;
 			cbmp.bFullCoverage = bFullCoverage;
 
-PORTNOTE("other","Removed PrintingMaskedRenderRegion usage")
 			if ( cbmp.IsValid() 
-#ifndef EXCLUDE_FROM_XARALX
 				 && !pRender->IsKindOf(CC_RUNTIME_CLASS(PrintingMaskedRenderRegion))
-#endif
 				)
 			{
 				pBitmapCache->StoreBitmap(inky, cbmp);
Index: Trunk/XaraLX/Kernel/view.cpp
===================================================================
--- Trunk/XaraLX/Kernel/view.cpp	(revision 1336)
+++ Trunk/XaraLX/Kernel/view.cpp	(revision 1337)
@@ -154,8 +154,8 @@
 #define new CAM_DEBUG_NEW
 
 #ifdef _DEBUG
-	#define _DEBUG_ATTACH_OPTIMAL_BITMAP
-	#define _DEBUG_ATTACH_OPTIMAL_MASK
+//	#define _DEBUG_ATTACH_OPTIMAL_BITMAP
+//	#define _DEBUG_ATTACH_OPTIMAL_MASK
 #endif
 
 //-----------------------------------------------------------------------------------------//


Xara