Changeset 7622

Timestamp:

12/08/07 16:08:32 (6 years ago)

Author:

robert

Message:

From Donald Cipperly, Fixed memory leak in computeIntersections

Files:

• OpenSceneGraph/trunk/src/osgViewer/View.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgViewer/View.cpp

@@ -1608 +1608 @@
 
     osgUtil::LineSegmentIntersector::CoordinateFrame cf = camera->getViewport() ? osgUtil::Intersector::WINDOW : osgUtil::Intersector::PROJECTION;
-    osgUtil::LineSegmentIntersector* picker = new osgUtil::LineSegmentIntersector(cf, local_x, local_y);
+    osg::ref_ptr< osgUtil::LineSegmentIntersector > picker = new osgUtil::LineSegmentIntersector(cf, local_x, local_y);
 
 #if 0
@@ -1621 +1621 @@
 #endif
 
-    osgUtil::IntersectionVisitor iv(picker);
+    osgUtil::IntersectionVisitor iv(picker.get());
     iv.setTraversalMask(traversalMask);
     const_cast<osg::Camera*>(camera)->accept(iv);
@@ -1664 +1664 @@
     osg::Vec3d endVertex = osg::Vec3d(local_x,local_y,zFar) * inverse;
     
-    osgUtil::LineSegmentIntersector* picker = new osgUtil::LineSegmentIntersector(osgUtil::Intersector::MODEL, startVertex, endVertex);
-    
-    osgUtil::IntersectionVisitor iv(picker);
+    osg::ref_ptr< osgUtil::LineSegmentIntersector > picker = new osgUtil::LineSegmentIntersector(osgUtil::Intersector::MODEL, startVertex, endVertex);
+    
+    osgUtil::IntersectionVisitor iv(picker.get());
     iv.setTraversalMask(traversalMask);
     nodePath.back()->accept(iv);