Maerge in default

--HG--
branch : minor
This commit is contained in:
Bart van Strien
2012-11-18 19:28:57 +01:00
13 changed files with 122 additions and 33 deletions
@@ -647,7 +647,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))