From a763fc88635c57c72e7cb10475f339be6951fee3 Mon Sep 17 00:00:00 2001 From: Bill Meltsner Date: Sun, 8 May 2011 18:50:01 -0400 Subject: [PATCH] some more cleanup --- src/modules/font/freetype/wrap_Font.h | 1 - src/modules/graphics/opengl/wrap_Graphics.cpp | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/modules/font/freetype/wrap_Font.h b/src/modules/font/freetype/wrap_Font.h index 5a7ca90c9..ac4cc59a2 100644 --- a/src/modules/font/freetype/wrap_Font.h +++ b/src/modules/font/freetype/wrap_Font.h @@ -33,7 +33,6 @@ namespace freetype { int w_newRasterizer(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); } // freetype diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp index 2b1a88cd7..4983116b2 100644 --- a/src/modules/graphics/opengl/wrap_Graphics.cpp +++ b/src/modules/graphics/opengl/wrap_Graphics.cpp @@ -241,7 +241,7 @@ namespace opengl } // 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}; luax_convobj(L, idxs, 2, "font", "newRasterizer"); } @@ -266,7 +266,7 @@ namespace opengl Image::Filter img_filter; // 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"); else if(luax_istype(L, 1, GRAPHICS_IMAGE_T)) { Image * i = luax_checktype(L, 1, "Image", GRAPHICS_IMAGE_T); @@ -472,7 +472,7 @@ namespace opengl } // 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}; luax_convobj(L, idxs, 2, "font", "newRasterizer"); }