[brlcad-commits] SF.net SVN: brlcad:[51571] brlcad/trunk/src/librt

[<pho...@us...>]

Revision: 51571
          http://brlcad.svn.sourceforge.net/brlcad/?rev=51571&view=rev
Author:   phoenixyjll
Date:     2012-07-18 03:45:45 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Use pointer to avoid copy-time crashing.

Modified Paths:
--------------
    brlcad/trunk/src/librt/opennurbs_ext.cpp
    brlcad/trunk/src/librt/opennurbs_ext.h

Modified: brlcad/trunk/src/librt/opennurbs_ext.cpp
===================================================================
--- brlcad/trunk/src/librt/opennurbs_ext.cpp	2012-07-18 00:04:40 UTC (rev 51570)
+++ brlcad/trunk/src/librt/opennurbs_ext.cpp	2012-07-18 03:45:45 UTC (rev 51571)
@@ -2927,7 +2927,7 @@
 int
 surface_surface_intersection(const ON_Surface* surfA,
 			     const ON_Surface* surfB,
-			     ON_SimpleArray<ON_NurbsCurve> &intersect,
+			     ON_SimpleArray<ON_NurbsCurve*> &intersect,
 			     double tolerance)
 {
     if (surfA == NULL || surfB == NULL) {
@@ -3134,9 +3134,8 @@
 	    ON_3dPointArray ptarray;
 	    ptarray.Append(polylines[i]->Count(), polylines[i]->Array());
 	    ON_PolylineCurve curve(ptarray);
-	    ON_NurbsCurve nurbscurve;
-	    if (curve.GetNurbForm(nurbscurve)) {
-		// It seems that there is a small problem here.
+	    ON_NurbsCurve *nurbscurve = ON_NurbsCurve::New();
+	    if (curve.GetNurbForm(*nurbscurve)) {
 		intersect.Append(nurbscurve);
 	    }
 	    delete polylines[i];

Modified: brlcad/trunk/src/librt/opennurbs_ext.h
===================================================================
--- brlcad/trunk/src/librt/opennurbs_ext.h	2012-07-18 00:04:40 UTC (rev 51570)
+++ brlcad/trunk/src/librt/opennurbs_ext.h	2012-07-18 03:45:45 UTC (rev 51571)
@@ -1570,7 +1570,7 @@
 
 extern int surface_surface_intersection(const ON_Surface* surfA,
 					const ON_Surface* surfB,
-					ON_SimpleArray<ON_NurbsCurve> &intersect,
+					ON_SimpleArray<ON_NurbsCurve*> &intersect,
 					double tolerance = 1.0e-3);
 
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.