[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1735
Date       : Mon Sep  4 11:03:55 BST 2006

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

Re-enable LineDefinition::ConvertIndexedColours, whioch seems to fix BZ#1597


Diff:
Index: Trunk/XaraLX/Kernel/linedef.cpp
===================================================================
--- Trunk/XaraLX/Kernel/linedef.cpp	(revision 1734)
+++ Trunk/XaraLX/Kernel/linedef.cpp	(revision 1735)
@@ -101,7 +101,7 @@
 
 #include "camtypes.h"
 #include "linedef.h"
-//#include "colormgr.h"
+#include "colormgr.h"
 //#include "spread.h" - in camtypes.h [AUTOMATICALLY REMOVED]
 
 CC_IMPLEMENT_DYNAMIC(LineDefinition, CCObject)
@@ -249,8 +249,6 @@
 
 void LineDefinition::ConvertIndexedColours(Spread* pRoot)
 {
-	PORTNOTETRACE("other","LineDefinition::ConvertIndexedColours - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
 	if (pRoot == NULL)
 	{
 		ERROR3("Spread is NULL");
@@ -310,5 +308,4 @@
 		
 		pNode = pNode->FindNext(CC_RUNTIME_CLASS(NodeRenderableInk));
 	}
-#endif
 }


Xara