FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed build with auto ptr conversion switched off

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14735 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2015-02-26 20:15:36 +00:00
parent f93a4f330a
commit 23b76599bd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgText/Text.cpp
View File

@ -1577,8 +1577,8 @@ void Text::drawForegroundText(osg::State& state, const GlyphQuads& glyphquad, co
const GlyphQuads::Coords3& transformedCoords = glyphquad._transformedCoords[contextID]; const GlyphQuads::Coords3& transformedCoords = glyphquad._transformedCoords[contextID];
if (!transformedCoords->empty()) if (!transformedCoords->empty())
{ {
state.setVertexPointer(transformedCoords); state.setVertexPointer(transformedCoords.get());
state.setTexCoordPointer(0, glyphquad._texcoords); state.setTexCoordPointer(0, glyphquad._texcoords.get());
if(_colorGradientMode == SOLID) if(_colorGradientMode == SOLID)
{ {
@ -1587,7 +1587,7 @@ void Text::drawForegroundText(osg::State& state, const GlyphQuads& glyphquad, co
} }
else else
{ {
state.setColorPointer(glyphquad._colorCoords); state.setColorPointer(glyphquad._colorCoords.get());
} }
glyphquad._quadIndices->draw(state, _useVertexBufferObjects); glyphquad._quadIndices->draw(state, _useVertexBufferObjects);
@ -1665,7 +1665,7 @@ void Text::drawTextWithBackdrop(osg::State& state, const osg::Vec4& colorMultipl
max_backdrop_index = _backdropType+1; max_backdrop_index = _backdropType+1;
} }
state.setTexCoordPointer(0, glyphquad._texcoords); state.setTexCoordPointer(0, glyphquad._texcoords.get());
state.disableColorPointer(); state.disableColorPointer();
state.Color(_backdropColor.r(),_backdropColor.g(),_backdropColor.b(),_backdropColor.a()); state.Color(_backdropColor.r(),_backdropColor.g(),_backdropColor.b(),_backdropColor.a());
@ -1674,7 +1674,7 @@ void Text::drawTextWithBackdrop(osg::State& state, const osg::Vec4& colorMultipl
const GlyphQuads::Coords3& transformedBackdropCoords = glyphquad._transformedBackdropCoords[backdrop_index][contextID]; const GlyphQuads::Coords3& transformedBackdropCoords = glyphquad._transformedBackdropCoords[backdrop_index][contextID];
if (!transformedBackdropCoords->empty()) if (!transformedBackdropCoords->empty())
{ {
state.setVertexPointer(transformedBackdropCoords); state.setVertexPointer(transformedBackdropCoords.get());
glyphquad._quadIndices->draw(state, _useVertexBufferObjects); glyphquad._quadIndices->draw(state, _useVertexBufferObjects);
} }
} }