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

Applied aq1018's fix for newFont and setFont (as partly described in ticket #232)

Browse Source
This commit is contained in:
bart@bartbes.ath.cx
2010-05-20 17:41:57 +02:00
parent 3d726b0dd9
commit a349c9f85a
1 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Graphics.cpp
+4 -2
View File
@@ -207,8 +207,9 @@ namespace opengl
if(luax_istype(L, 1, FILESYSTEM_FILE_T)) { if(luax_istype(L, 1, FILESYSTEM_FILE_T)) {
love::filesystem::File * f = luax_checktype<love::filesystem::File>(L, 1, "File", FILESYSTEM_FILE_T); love::filesystem::File * f = luax_checktype<love::filesystem::File>(L, 1, "File", FILESYSTEM_FILE_T);
Data * d = f->read(); Data * d = f->read();
lua_pop(L, 1); // get rid of the file lua_remove(L, 1); // get rid of the file
luax_newtype(L, "Data", DATA_T, (void*)d); luax_newtype(L, "Data", DATA_T, (void*)d);
lua_insert(L, 1); // put it at the bottom of the stack
} }
// Convert to Rasterizer, if necessary. // Convert to Rasterizer, if necessary.
@@ -345,8 +346,9 @@ namespace opengl
if(luax_istype(L, 1, FILESYSTEM_FILE_T)) { if(luax_istype(L, 1, FILESYSTEM_FILE_T)) {
love::filesystem::File * f = luax_checktype<love::filesystem::File>(L, 1, "File", FILESYSTEM_FILE_T); love::filesystem::File * f = luax_checktype<love::filesystem::File>(L, 1, "File", FILESYSTEM_FILE_T);
Data * d = f->read(); Data * d = f->read();
lua_pop(L, 1); // get rid of the file lua_remove(L, 1); // get rid of the file
luax_newtype(L, "Data", DATA_T, (void*)d); luax_newtype(L, "Data", DATA_T, (void*)d);
lua_insert(L, 1); // put it at the bottom of the stack
} }
// Convert to Rasterizer, if necessary. // Convert to Rasterizer, if necessary.