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

some more cleanup

Browse Source
This commit is contained in:
Bill Meltsner
2011-05-08 18:50:01 -04:00
parent 2e675a40c0
commit a763fc8863
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/font/freetype/wrap_Font.h
-1
View File
@@ -33,7 +33,6 @@ namespace freetype
{ {
int w_newRasterizer(lua_State * L); int w_newRasterizer(lua_State * L);
int w_newGlyphData(lua_State * L); int w_newGlyphData(lua_State * L);
int w_newFontData(lua_State * L);
extern "C" LOVE_EXPORT int luaopen_love_font(lua_State * L); extern "C" LOVE_EXPORT int luaopen_love_font(lua_State * L);
} // freetype } // freetype
src/modules/graphics/opengl/wrap_Graphics.cpp
+3 -3
View File
@@ -241,7 +241,7 @@ namespace opengl
} }
// Convert to Rasterizer, if necessary. // Convert to Rasterizer, if necessary.
if(luax_istype(L, 1, DATA_T) && !luax_istype(L, 1, FONT_FONT_DATA_T)) { if(luax_istype(L, 1, DATA_T)) {
int idxs[] = {1, 2}; int idxs[] = {1, 2};
luax_convobj(L, idxs, 2, "font", "newRasterizer"); luax_convobj(L, idxs, 2, "font", "newRasterizer");
} }
@@ -266,7 +266,7 @@ namespace opengl
Image::Filter img_filter; Image::Filter img_filter;
// Convert to ImageData if necessary. // Convert to ImageData if necessary.
if(lua_isstring(L, 1) || luax_istype(L, 1, FILESYSTEM_FILE_T) || (luax_istype(L, 1, DATA_T) && !luax_istype(L, 1, IMAGE_IMAGE_DATA_T) && !luax_istype(L, 1, FONT_FONT_DATA_T))) if(lua_isstring(L, 1) || luax_istype(L, 1, FILESYSTEM_FILE_T) || (luax_istype(L, 1, DATA_T) && !luax_istype(L, 1, IMAGE_IMAGE_DATA_T)))
luax_convobj(L, 1, "image", "newImageData"); luax_convobj(L, 1, "image", "newImageData");
else if(luax_istype(L, 1, GRAPHICS_IMAGE_T)) { else if(luax_istype(L, 1, GRAPHICS_IMAGE_T)) {
Image * i = luax_checktype<Image>(L, 1, "Image", GRAPHICS_IMAGE_T); Image * i = luax_checktype<Image>(L, 1, "Image", GRAPHICS_IMAGE_T);
@@ -472,7 +472,7 @@ namespace opengl
} }
// Convert to Rasterizer, if necessary. // Convert to Rasterizer, if necessary.
if(luax_istype(L, 1, DATA_T) && !luax_istype(L, 1, FONT_FONT_DATA_T)) { if(luax_istype(L, 1, DATA_T)) {
int idxs[] = {1, 2}; int idxs[] = {1, 2};
luax_convobj(L, idxs, 2, "font", "newRasterizer"); luax_convobj(L, idxs, 2, "font", "newRasterizer");
} }