TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 19:08:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

prevent crash from bam files

Browse Source
This commit is contained in:
David Rose 2005-12-22 17:35:37 +00:00
parent c39ef34932
commit 9e82e17ae7
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
panda/src/text/geomTextGlyph.cxx
View File

@ -39,9 +39,9 @@ GeomTextGlyph(DynamicTextGlyph *glyph, const GeomVertexData *data) :
// Initially, there is only one glyph in the Geom. There might be // Initially, there is only one glyph in the Geom. There might be
// additional Glyphs later when we flatten the graph and call // additional Glyphs later when we flatten the graph and call
// Geom::unify(). // Geom::unify().
if (glyph != (DynamicTextGlyph *)NULL) {
_glyphs.reserve(1); _glyphs.reserve(1);
_glyphs.push_back(glyph); _glyphs.push_back(glyph);
if (glyph != (DynamicTextGlyph *)NULL) {
glyph->_geom_count++; glyph->_geom_count++;
} }
} }
@ -58,7 +58,9 @@ GeomTextGlyph(const GeomTextGlyph &copy) :
{ {
Glyphs::iterator gi; Glyphs::iterator gi;
for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) { for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {
(*gi)->_geom_count++; DynamicTextGlyph *glyph = (*gi);
nassertv(glyph != (DynamicTextGlyph *)NULL);
glyph->_geom_count++;
} }
} }
@ -73,12 +75,16 @@ operator = (const GeomTextGlyph &copy) {
Glyphs::iterator gi; Glyphs::iterator gi;
for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) { for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {
(*gi)->_geom_count--; DynamicTextGlyph *glyph = (*gi);
nassertv(glyph != (DynamicTextGlyph *)NULL);
glyph->_geom_count--;
nassertv((*gi)->_geom_count >= 0); nassertv((*gi)->_geom_count >= 0);
} }
_glyphs = copy._glyphs; _glyphs = copy._glyphs;
for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) { for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {
(*gi)->_geom_count++; DynamicTextGlyph *glyph = (*gi);
nassertv(glyph != (DynamicTextGlyph *)NULL);
glyph->_geom_count++;
} }
} }
@ -91,8 +97,10 @@ GeomTextGlyph::
~GeomTextGlyph() { ~GeomTextGlyph() {
Glyphs::iterator gi; Glyphs::iterator gi;
for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) { for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {
(*gi)->_geom_count--; DynamicTextGlyph *glyph = (*gi);
nassertv((*gi)->_geom_count >= 0); nassertv(glyph != (DynamicTextGlyph *)NULL);
glyph->_geom_count--;
nassertv(glyph->_geom_count >= 0);
} }
} }
@ -153,7 +161,9 @@ output(ostream &out) const {
out << ", glyphs: ["; out << ", glyphs: [";
Glyphs::const_iterator gi; Glyphs::const_iterator gi;
for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) { for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {
out << " " << (*gi)->get_character(); DynamicTextGlyph *glyph = (*gi);
nassertv(glyph != (DynamicTextGlyph *)NULL);
out << " " << glyph->get_character();
} }
out << " ]"; out << " ]";
} }
@ -170,7 +180,9 @@ write(ostream &out, int indent_level) const {
<< "Glyphs: ["; << "Glyphs: [";
Glyphs::const_iterator gi; Glyphs::const_iterator gi;
for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) { for (gi = _glyphs.begin(); gi != _glyphs.end(); ++gi) {
out << " " << (*gi)->get_character(); DynamicTextGlyph *glyph = (*gi);
nassertv(glyph != (DynamicTextGlyph *)NULL);
out << " " << glyph->get_character();
} }
out << " ]\n"; out << " ]\n";
} }