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

Merge default branch.

Browse Source 
--HG--
branch : minor
This commit is contained in:
rude
2013-01-12 11:52:04 +01:00
parent af922e93e8 697f4de80a
commit c03e35b6cc
9 changed files with 347 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Graphics.cpp
+16 -3
View File
@@ -335,7 +335,12 @@ int w_newFont(lua_State *L)
if (luax_istype(L, 1, DATA_T))
{
int idxs[] = {1, 2};
luax_convobj(L, idxs, 2, "font", "newRasterizer");
int ret = luax_pconvobj(L, idxs, 2, "font", "newRasterizer");
if (ret != 0)
{
font_data->release();
return lua_error(L);
}
}
if (font_data)
@@ -343,8 +348,16 @@ int w_newFont(lua_State *L)
love::font::Rasterizer *rasterizer = luax_checktype<love::font::Rasterizer>(L, 1, "Rasterizer", FONT_RASTERIZER_T);
// Create the font.
Font *font = instance->newFont(rasterizer, instance->getDefaultImageFilter());
Font *font = NULL;
try
{
// Create the font.
font = instance->newFont(rasterizer, instance->getDefaultImageFilter());
}
catch (love::Exception &e)
{
return luaL_error(L, e.what());
}
if (font == 0)
return luaL_error(L, "Could not load font.");