[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : gerry
Repository : xara
Revision   : 1368
Date       : Mon Jun 26 12:30:20 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/xpfrgn.cpp

Oops, put back non-test code


Diff:
Index: Trunk/XaraLX/Kernel/xpfrgn.cpp
===================================================================
--- Trunk/XaraLX/Kernel/xpfrgn.cpp	(revision 1367)
+++ Trunk/XaraLX/Kernel/xpfrgn.cpp	(revision 1368)
@@ -241,6 +241,41 @@
 
 void XPFRenderRegion::DrawPathToOutputDevice(Path* pPathToRender, PathShape)
 {
+	if (m_pTransInfo && m_pTransInfo->IsCommonType())
+	{
+		// Path rendering happens in two parts, the fill and the stroke
+		// so these must be checked separately
+
+		if (pPathToRender->IsFilled)
+		{
+			// Get the fill attribute
+			FillGeometryAttribute* pFillAttr = (FillGeometryAttribute*) CurrentAttrs[ATTR_FILLGEOMETRY].pAttr;
+			
+			// If it is not a no-colour flat fill then
+
+			if (!IS_A(pFillAttr, FlatFillAttribute) || !(RR_FILLCOLOUR().IsTransparent()))
+			{
+				// Get the current Transparency Fill Geometry
+				TranspFillAttribute* pTransAttr = RR_FILLTRANSP();
+
+				// And update the common type object
+				m_pTransInfo->UpdateCommonType(pTransAttr->GetTranspType());
+			}
+		}
+
+		if (pPathToRender->IsStroked)
+		{
+			// If the stroke colour is not transparent
+			if (!(RR_STROKECOLOUR().IsTransparent()))
+			{
+				// Get the current Transparency Fill Geometry
+				StrokeTranspAttribute* pTransAttr = RR_STROKETRANSP();
+
+				// And update the common type object
+				m_pTransInfo->UpdateCommonType(pTransAttr->GetTranspType());
+			}
+		}
+	}
 }
 
 


Xara