[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1247
Date       : Mon Jun  5 10:32:14 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/bfxpixop.cpp
   M /Trunk/XaraLX/wxOil/sgldrag.cpp

Fix build server warnings


Diff:
Index: Trunk/XaraLX/wxOil/sgldrag.cpp
===================================================================
--- Trunk/XaraLX/wxOil/sgldrag.cpp	(revision 1246)
+++ Trunk/XaraLX/wxOil/sgldrag.cpp	(revision 1247)
@@ -681,7 +681,7 @@
 {
 	double NearestDist = -1;
 	BOOL GotNearest = FALSE;
-	BOOL NearestIsStart;
+	BOOL NearestIsStart = FALSE;
 
 	DocCoord* Coords = pPathHit->GetCoordArray();
 	PathVerb* Verbs  = pPathHit->GetVerbArray();
Index: Trunk/XaraLX/wxOil/bfxpixop.cpp
===================================================================
--- Trunk/XaraLX/wxOil/bfxpixop.cpp	(revision 1246)
+++ Trunk/XaraLX/wxOil/bfxpixop.cpp	(revision 1247)
@@ -1379,6 +1379,7 @@
 
 void Octree::CheckIntegrity()
 {
+#ifdef _DEBUG // avoid unused variable warnings
 	for (INT32 d=0; d<=8; d++) for (INT32 c=0; c<=8; c++)
 	{
 		OctreeElement *pCheck = ListHead[d][c];
@@ -1398,14 +1399,12 @@
 			 	count++;
 				ERROR3IF(pChild->pParent != pCheck, "Bad parent link");
 				ERROR3IF(pChild->Depth != d+1, "Bad child depth");
-#ifdef _DEBUG // avoid unused variable warnings
 				INT32 R=pCheck->R + ((cc&1)?halfwidth:0);
 				INT32 G=pCheck->G + ((cc&2)?halfwidth:0);				
 				INT32 B=pCheck->B + ((cc&4)?halfwidth:0);
 				ERROR3IF(pChild->R != R, "Bad child R");
 				ERROR3IF(pChild->G != G, "Bad child G");
 				ERROR3IF(pChild->B != B, "Bad child B");
-#endif
 				OctreeElement *pLChild = pChild;
 				while (pLChild->pListPrev) pLChild=pLChild->pListPrev;
 				ERROR3IF(pLChild!=ListHead[d+1][pLChild->NumChildren],"Child not in a list");
@@ -1414,6 +1413,7 @@
 			pCheck=pCheck->pListNext;
 		}
 	}
+#endif
 	return;
 }	
 


Xara