enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 1 Projects Releases Wiki Activity

Evas filters: Fix some parsing errors

This commit is contained in:
Jean-Philippe Andre 2014-05-09 16:07:41 +09:00
parent 139f7bc178
commit 8c8816aca6
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/evas/filters/evas_filter_parser.c
View File

@ -9,11 +9,11 @@
# define LUA52 1 # define LUA52 1
#endif #endif
//#ifdef DEBUG #ifdef DEBUG
# define FILTERS_DEBUG # define FILTERS_DEBUG
//#endif #endif
#define FILTERS_LEGACY_COMPAT //#define FILTERS_LEGACY_COMPAT
#define EVAS_FILTER_MODE_GROW (EVAS_FILTER_MODE_LAST+1) #define EVAS_FILTER_MODE_GROW (EVAS_FILTER_MODE_LAST+1)
#define EVAS_FILTER_MODE_BUFFER (EVAS_FILTER_MODE_LAST+2) #define EVAS_FILTER_MODE_BUFFER (EVAS_FILTER_MODE_LAST+2)
@ -1884,7 +1884,7 @@ _lua_state_create(Evas_Filter_Program *pgm)
{ EINA_TRUE, "enabled" }, { EINA_TRUE, "enabled" },
{ EINA_FALSE, "off" }, { EINA_FALSE, "off" },
{ EINA_FALSE, "no" }, { EINA_FALSE, "no" },
{ EINA_FALSE, "disnable" }, { EINA_FALSE, "disable" },
{ EINA_FALSE, "disabled" } { EINA_FALSE, "disabled" }
}; };
@ -1894,6 +1894,17 @@ _lua_state_create(Evas_Filter_Program *pgm)
lua_setglobal(L, booleans[k].name); lua_setglobal(L, booleans[k].name);
} }
// Buffers. Should be input & output only.
{
Buffer *buf;
EINA_INLIST_FOREACH(pgm->buffers, buf)
{
lua_pushstring(L, buf->name);
lua_setglobal(L, buf->name);
}
}
// Register proxies // Register proxies
if (pgm->proxies) if (pgm->proxies)
{ {
@ -2061,6 +2072,7 @@ evas_filter_program_parse(Evas_Filter_Program *pgm, const char *str)
if (ok) ok = !lua_pcall(L, 0, LUA_MULTRET, 0); if (ok) ok = !lua_pcall(L, 0, LUA_MULTRET, 0);
lua_close(L); lua_close(L);
ok &= (pgm->instructions != NULL);
pgm->valid = ok; pgm->valid = ok;
pgm->padding_calc = EINA_FALSE; pgm->padding_calc = EINA_FALSE;