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

Fix 3/4 of issue #327: memory allocation issues.

Browse Source
This commit is contained in:
vrld
2011-11-08 23:22:48 +01:00
parent f9077ee1a6
commit aedf532cdc
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Graphics.cpp
+6 -3
View File
@@ -245,6 +245,7 @@ namespace opengl
int w_newFont1(lua_State * L)
{
Data * font_data = NULL;
// Convert to File, if necessary.
if(lua_isstring(L, 1))
luax_convobj(L, 1, "filesystem", "newFile");
@@ -252,15 +253,14 @@ namespace opengl
// Convert to Data, if necessary.
if(luax_istype(L, 1, FILESYSTEM_FILE_T)) {
love::filesystem::File * f = luax_checktype<love::filesystem::File>(L, 1, "File", FILESYSTEM_FILE_T);
Data * d;
try {
d = f->read();
font_data = f->read();
}
catch (love::Exception & e) {
return luaL_error(L, e.what());
}
lua_remove(L, 1); // get rid of the file
luax_newtype(L, "Data", DATA_T, (void*)d);
luax_newtype(L, "Data", DATA_T, (void*)font_data);
lua_insert(L, 1); // put it at the bottom of the stack
}
@@ -270,6 +270,9 @@ namespace opengl
luax_convobj(L, idxs, 2, "font", "newRasterizer");
}
if (font_data)
font_data->release();
love::font::Rasterizer * rasterizer = luax_checktype<love::font::Rasterizer>(L, 1, "Rasterizer", FONT_RASTERIZER_T);
// Create the font.