[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 822
Date       : Sun Apr 16 20:01:50 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/colcomp.cpp
   M /Trunk/XaraLX/Kernel/fillattr.cpp
   M /Trunk/XaraLX/Kernel/penedit.cpp

Fixed warnings on build server


Diff:
Index: Trunk/XaraLX/Kernel/fillattr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/fillattr.cpp	(revision 821)
+++ Trunk/XaraLX/Kernel/fillattr.cpp	(revision 822)
@@ -15175,7 +15175,8 @@
 	// Contone?
 	DocColour* pStartCol= Value.GetStartColour();
 	DocColour* pEndCol	= Value.GetEndColour();
-	INT32 StartColRef, EndColRef;
+	INT32 StartColRef=0;
+	INT32 EndColRef=0;
 
 	if (pStartCol != NULL && pEndCol != NULL)
 	{
Index: Trunk/XaraLX/Kernel/penedit.cpp
===================================================================
--- Trunk/XaraLX/Kernel/penedit.cpp	(revision 821)
+++ Trunk/XaraLX/Kernel/penedit.cpp	(revision 822)
@@ -2746,7 +2746,7 @@
 	
 	// We had better copy the path back over the original and re-calc the bounding box
 	DocView* pDocView = DocView::GetSelected();
-	ENSURE( pDocView != NULL, "There was no selected DocView when editing a path" );
+	ERROR2IF( pDocView == NULL, (void)0, "There was no selected DocView when editing a path" );
 
 	// Create a path to hold the data
 	NodePath* NewPath = new NodePath;
@@ -2930,7 +2930,7 @@
 	DoStartSelOp(TRUE,TRUE);
 	
 	DocView* pDocView = DocView::GetSelected();
-	ENSURE( pDocView != NULL, "There was no selected docview when augmenting a path" );
+	ERROR2IF( pDocView == NULL, (void)0, "There was no selected docview when augmenting a path" );
 
 	// Save the bounds of the path for undo/redo
 	if (RecalcBoundsAction::DoRecalc(this, &UndoActions, pNode) == AC_FAIL)
@@ -3117,7 +3117,7 @@
 	DoStartSelOp(TRUE,TRUE);
 	
 	DocView* pDocView = DocView::GetSelected();
-	ENSURE( pDocView != NULL, "There was no selected doc view when closing a path" );
+	ERROR2IF( pDocView == NULL, (void)0, "There was no selected doc view when closing a path" );
 
 	// Save the bounds of the path for undo/redo
 	if (RecalcBoundsAction::DoRecalc(this, &UndoActions, pDestinNode) == AC_FAIL)
Index: Trunk/XaraLX/Kernel/colcomp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/colcomp.cpp	(revision 821)
+++ Trunk/XaraLX/Kernel/colcomp.cpp	(revision 822)
@@ -1861,7 +1861,7 @@
 	// If the colour is linked, we save out the component as an illegal known value
 	// Convert the colour types into export colour types
 	// Should be a straight conversion but just in case...
-	ExportColourType ExpColType;
+	ExportColourType ExpColType=EXPORT_COLOURTYPE_NORMAL;
 	switch (ColType)
 	{
 		case COLOURTYPE_NORMAL:	ExpColType = EXPORT_COLOURTYPE_NORMAL;	break;


Xara