From d24c0344c8840bb1f94f1513de9c4a72209b3563 Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Sun, 18 Nov 2012 19:18:37 +0100 Subject: [PATCH] Make second argument to setDefaultImageFilter Image:setFilter and Image:setWrap optional, and default to the first --- src/modules/graphics/opengl/wrap_Graphics.cpp | 2 +- src/modules/graphics/opengl/wrap_Image.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/graphics/opengl/wrap_Graphics.cpp b/src/modules/graphics/opengl/wrap_Graphics.cpp index 44506307f..cd87f2e3e 100644 --- a/src/modules/graphics/opengl/wrap_Graphics.cpp +++ b/src/modules/graphics/opengl/wrap_Graphics.cpp @@ -589,7 +589,7 @@ int w_setDefaultImageFilter(lua_State *L) Image::FilterMode min; Image::FilterMode mag; const char *minstr = luaL_checkstring(L, 1); - const char *magstr = luaL_checkstring(L, 2); + const char *magstr = luaL_optstring(L, 2, minstr); if (!Image::getConstant(minstr, min)) return luaL_error(L, "Invalid filter mode: %s", minstr); if (!Image::getConstant(magstr, mag)) diff --git a/src/modules/graphics/opengl/wrap_Image.cpp b/src/modules/graphics/opengl/wrap_Image.cpp index fa09f000d..af40f3add 100644 --- a/src/modules/graphics/opengl/wrap_Image.cpp +++ b/src/modules/graphics/opengl/wrap_Image.cpp @@ -54,7 +54,7 @@ int w_Image_setFilter(lua_State *L) Image::FilterMode min; Image::FilterMode mag; const char *minstr = luaL_checkstring(L, 2); - const char *magstr = luaL_checkstring(L, 3); + const char *magstr = luaL_optstring(L, 3, minstr); if (!Image::getConstant(minstr, min)) return luaL_error(L, "Invalid filter mode: %s", minstr); if (!Image::getConstant(magstr, mag)) @@ -88,7 +88,7 @@ int w_Image_setWrap(lua_State *L) Image::WrapMode s; Image::WrapMode t; const char *sstr = luaL_checkstring(L, 2); - const char *tstr = luaL_checkstring(L, 3); + const char *tstr = luaL_optstring(L, 3, sstr); if (!Image::getConstant(sstr, s)) return luaL_error(L, "Invalid wrap mode: %s", sstr); if (!Image::getConstant(tstr, t))