[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1501
Date       : Mon Jul 24 12:40:18 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/nodershp.cpp
   M /Trunk/XaraLX/Kernel/ppstroke.cpp

Fix bug #1305 (SEGV due to poor error handling and portnote'd code)


Diff:
Index: Trunk/XaraLX/Kernel/nodershp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodershp.cpp	(revision 1500)
+++ Trunk/XaraLX/Kernel/nodershp.cpp	(revision 1501)
@@ -1425,6 +1425,8 @@
 		Path* pShapePath = NULL;
 		if (BuildShapePath(&pShapePath))
 			pRetNode = pPPS->GetProcessedPath(pShapePath, this);
+
+		ERROR2IF(!pRetNode, NULL, "Failed to get a Processed Path");
 				
 		// now we have a choice, pass in the stroking flag to produce a path that works with bevels
 		Path CopyPath;
Index: Trunk/XaraLX/Kernel/ppstroke.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ppstroke.cpp	(revision 1500)
+++ Trunk/XaraLX/Kernel/ppstroke.cpp	(revision 1501)
@@ -466,15 +466,12 @@
 
 NodePath* PathProcessorStroke::GetProcessedPath(Path* pPath, Node* pParent)
 {
-	PORTNOTETRACE("other","PathProcessorStroke::GetProcessedPath - do nothing");
-	return NULL;
-#ifndef EXCLUDE_FROM_XARALX
 	// we need to fake a renderregion as our helper functions need one,
 	// luckily FormatRegion is on hand from the text stuff
 	FormatRegion FakeRender;
 
 	if (!FakeRender.Init((NodeRenderableInk*)pParent)) // init renders all applied attributes into the region
-		return FALSE;
+		return NULL;
 
 	
 	// From here copied from ProcessPath:
@@ -527,7 +524,6 @@
 	pOutput = NULL;
 
 	return pNewNode;
-#endif
 }
 
 


Xara