From 5b62692c7da49d213617092a8f4c7180f030739c Mon Sep 17 00:00:00 2001 From: Bill Meltsner Date: Tue, 12 Oct 2010 19:35:53 -0500 Subject: [PATCH] love.graphics.newImageFont now accepts an Image as its first argument --- src/modules/graphics/opengl/wrap_Graphics.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp index 5a38365d5..ac8fa77c7 100644 --- a/src/modules/graphics/opengl/wrap_Graphics.cpp +++ b/src/modules/graphics/opengl/wrap_Graphics.cpp @@ -246,8 +246,14 @@ namespace opengl int w_newImageFont(lua_State * L) { // 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))) + 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))) 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); + love::image::ImageData * id = i->getData(); + luax_newtype(L, "ImageData", IMAGE_IMAGE_DATA_T, (void*)id, false); + lua_replace(L, 1); + } // Convert to Rasterizer if necessary. if(luax_istype(L, 1, IMAGE_IMAGE_DATA_T)) {