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

Restructed setting of vertex array to avoid possible reference of null

Browse Source
This commit is contained in:
Robert Osfield
2016-06-23 07:47:40 +01:00
parent 20d1e4c9c5
commit 14805dc8b9
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgText/GlyphGeometry.cpp
View File

@@ -493,8 +493,12 @@ public:
unsigned int start = (*_elements)[0];
unsigned int count = _elements->size();
if (geometry->getVertexArray()==0) geometry->setVertexArray(new osg::Vec3Array(*_vertices));
osg::Vec3Array* new_vertices = dynamic_cast<osg::Vec3Array*>(geometry->getVertexArray());
if (!new_vertices)
{
new_vertices = new osg::Vec3Array(*_vertices);
geometry->setVertexArray(new_vertices);
}
// allocate the primitive set to store the face geometry
osg::ref_ptr<osg::DrawElementsUShort> face = new osg::DrawElementsUShort(GL_POLYGON);
@@ -1342,7 +1346,7 @@ OSGTEXT_EXPORT osg::Geometry* computeShellGeometry(osg::Geometry* glyphGeometry,
osg::CopyOp copyop(osg::CopyOp::DEEP_COPY_ALL);
osg::DrawElementsUShort* front_strip = dynamic_cast<osg::DrawElementsUShort*>(copyop(strip));
osg::DrawElementsUShort* front_strip = new osg::DrawElementsUShort(*strip, copyop);
text_geometry->addPrimitiveSet(front_strip);
for(unsigned int i=0; i<front_strip->size(); ++i)
{
@@ -1362,7 +1366,7 @@ OSGTEXT_EXPORT osg::Geometry* computeShellGeometry(osg::Geometry* glyphGeometry,
std::swap(p1,p2);
}
osg::DrawElementsUShort* back_strip = dynamic_cast<osg::DrawElementsUShort*>(copyop(strip));
osg::DrawElementsUShort* back_strip = new osg::DrawElementsUShort(*strip, copyop);
text_geometry->addPrimitiveSet(back_strip);
for(unsigned int i=0; i<back_strip->size(); ++i)
{