From 56bc3ae194eaf3bbadc271e15ab15e3806fc41ca Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 3 Oct 2008 13:38:55 +0000 Subject: [PATCH] Compile fix required when using ref_ptr<> implicit output conversion --- src/osgUtil/Simplifier.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgUtil/Simplifier.cpp b/src/osgUtil/Simplifier.cpp index 4a4c83936..a38764722 100644 --- a/src/osgUtil/Simplifier.cpp +++ b/src/osgUtil/Simplifier.cpp @@ -228,7 +228,7 @@ public: return false; } - osg::ref_ptr pNew = edge->_proposedPoint.valid()? edge->_proposedPoint : computeInterpolatedPoint(edge,0.5f); + osg::ref_ptr pNew = edge->_proposedPoint.valid()? edge->_proposedPoint.get() : computeInterpolatedPoint(edge,0.5f); return (collapseEdge(edge,pNew.get())); } osg::notify(osg::INFO)<<"collapseMinimumErrorEdge() return false due to _edgeSet.empty()"< pNew = edge->_proposedPoint.valid()? edge->_proposedPoint : computeInterpolatedPoint(edge,0.5f); + osg::ref_ptr pNew = edge->_proposedPoint.valid()? edge->_proposedPoint.get() : computeInterpolatedPoint(edge,0.5f); return (divideEdge(edge,pNew.get())); } osg::notify(osg::INFO)<<"divideLongestEdge() return false due to _edgeSet.empty()"<