From b2386d720107d339fcfde0ede63107ab8e53698d Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Mon, 27 Sep 2010 21:08:05 +0200 Subject: [PATCH] (Hopefully) Fixed a bug where ImageData was not seen as preconverted by newImageFont (#73) --- src/modules/graphics/opengl/wrap_Graphics.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp index 399fbaee3..5a38365d5 100644 --- a/src/modules/graphics/opengl/wrap_Graphics.cpp +++ b/src/modules/graphics/opengl/wrap_Graphics.cpp @@ -246,7 +246,7 @@ 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)) + 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"); // Convert to Rasterizer if necessary.