LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 20:19:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hopefully fixed more memory leakage in fonts

Browse Source
This commit is contained in:
Bart van Strien
2010-09-18 10:07:52 +02:00
parent 99abe5ae19
commit 2b273c0081
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/font/GlyphData.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ namespace font
GlyphData::~GlyphData() GlyphData::~GlyphData()
{ {
delete data; delete[] data;
} }
void * GlyphData::getData() const void * GlyphData::getData() const
src/modules/graphics/opengl/Font.cpp
+8 -4
View File
@@ -34,7 +34,7 @@ namespace opengl
: height(data->getHeight()), lineHeight(1.25), mSpacing(1) : height(data->getHeight()), lineHeight(1.25), mSpacing(1)
{ {
glyphs = new Glyph*[MAX_CHARS]; glyphs = new Glyph*[MAX_CHARS];
for(unsigned int i = 0; i < MAX_CHARS; i++) for(unsigned int i = 0; i < MAX_CHARS; i++)
{ {
glyphs[i] = new Glyph(data->getGlyphData(i)); glyphs[i] = new Glyph(data->getGlyphData(i));
@@ -48,6 +48,10 @@ namespace opengl
Font::~Font() Font::~Font()
{ {
for(unsigned int i = 0; i < MAX_CHARS; i++)
{
delete glyphs[i];
}
delete[] glyphs; delete[] glyphs;
} }
@@ -166,20 +170,20 @@ namespace opengl
{ {
return mSpacing; return mSpacing;
} }
bool Font::loadVolatile() bool Font::loadVolatile()
{ {
// reload all glyphs // reload all glyphs
for(unsigned int i = 0; i < MAX_CHARS; i++) for(unsigned int i = 0; i < MAX_CHARS; i++)
{ {
glyphs[i]->load(); glyphs[i]->load();
glNewList(list + i, GL_COMPILE); glNewList(list + i, GL_COMPILE);
glyphs[i]->draw(0, 0, 0, 1, 1, 0, 0); glyphs[i]->draw(0, 0, 0, 1, 1, 0, 0);
glEndList(); glEndList();
} }
return true; return true;
} }
void Font::unloadVolatile() void Font::unloadVolatile()
{ {
// delete the glyphs // delete the glyphs