dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evas filters: Use strcasecmp in the parser 

We don't care about the case for our language.
EVEN for buffer names, so beware :)
This commit is contained in:
Jean-Philippe Andre 2013-12-11 19:35:24 +09:00
parent a5abbf784e
commit aa945c25e0
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,7 +179,7 @@ _instruction_param_geti(Evas_Filter_Instruction *instr, const char *name,
int i = 0; int i = 0;
EINA_INLIST_FOREACH(instr->params, param) EINA_INLIST_FOREACH(instr->params, param)
if (!strcmp(name, param->name)) if (!strcasecmp(name, param->name))
{ {
if (eina_value_get(param->value, &i)) if (eina_value_get(param->value, &i))
{ {
@ -201,7 +201,7 @@ _instruction_param_getd(Evas_Filter_Instruction *instr, const char *name,
double i = 0; double i = 0;
EINA_INLIST_FOREACH(instr->params, param) EINA_INLIST_FOREACH(instr->params, param)
if (!strcmp(name, param->name)) if (!strcasecmp(name, param->name))
{ {
if (eina_value_get(param->value, &i)) if (eina_value_get(param->value, &i))
{ {
@ -223,7 +223,7 @@ _instruction_param_getc(Evas_Filter_Instruction *instr, const char *name,
DATA32 i = 0; DATA32 i = 0;
EINA_INLIST_FOREACH(instr->params, param) EINA_INLIST_FOREACH(instr->params, param)
if (!strcmp(name, param->name)) if (!strcasecmp(name, param->name))
{ {
if (eina_value_get(param->value, &i)) if (eina_value_get(param->value, &i))
{ {
@ -245,7 +245,7 @@ _instruction_param_gets(Evas_Filter_Instruction *instr, const char *name,
const char *str = NULL; const char *str = NULL;
EINA_INLIST_FOREACH(instr->params, param) EINA_INLIST_FOREACH(instr->params, param)
if (!strcmp(name, param->name)) if (!strcasecmp(name, param->name))
{ {
if (eina_value_get(param->value, &str)) if (eina_value_get(param->value, &str))
{ {
@ -668,7 +668,7 @@ _buffer_instruction_prepare(Evas_Filter_Instruction *instr)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE);
EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcmp(instr->name, "buffer"), EINA_FALSE); EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcasecmp(instr->name, "buffer"), EINA_FALSE);
/* /*
* buffer [name=]NAME (alpha=BOOL) (src=OBJECT) * buffer [name=]NAME (alpha=BOOL) (src=OBJECT)
@ -688,7 +688,7 @@ _blend_instruction_prepare(Evas_Filter_Instruction *instr)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE);
EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcmp(instr->name, "blend"), EINA_FALSE); EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcasecmp(instr->name, "blend"), EINA_FALSE);
/* /*
* blend [src=BUFFER] [dst=BUFFER] [ox=INT] [oy=INT] (color=COLOR) * blend [src=BUFFER] [dst=BUFFER] [ox=INT] [oy=INT] (color=COLOR)
@ -746,7 +746,7 @@ _blur_instruction_prepare(Evas_Filter_Instruction *instr)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE);
EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcmp(instr->name, "blur"), EINA_FALSE); EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcasecmp(instr->name, "blur"), EINA_FALSE);
/* /*
* blur [rx=]REAL [ry=REAL] [type=STRING] [ox=INT] [oy=INT] \ * blur [rx=]REAL [ry=REAL] [type=STRING] [ox=INT] [oy=INT] \
@ -772,7 +772,7 @@ _bump_instruction_prepare(Evas_Filter_Instruction *instr)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE);
EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcmp(instr->name, "bump"), EINA_FALSE); EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcasecmp(instr->name, "bump"), EINA_FALSE);
/* /*
* bump [map=]ABUFFER [azimuth=REAL] [elevation=REAL] [depth=REAL] \ * bump [map=]ABUFFER [azimuth=REAL] [elevation=REAL] [depth=REAL] \
@ -801,7 +801,7 @@ _curve_instruction_prepare(Evas_Filter_Instruction *instr)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE);
EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcmp(instr->name, "curve"), EINA_FALSE); EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcasecmp(instr->name, "curve"), EINA_FALSE);
/* /*
* curve TODO * curve TODO
@ -837,7 +837,7 @@ _displace_instruction_prepare(Evas_Filter_Instruction *instr)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE);
EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcmp(instr->name, "displace"), EINA_FALSE); EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcasecmp(instr->name, "displace"), EINA_FALSE);
/* /*
* displace [map=]BUFFER [intensity=]INT [flags=]STRING \ * displace [map=]BUFFER [intensity=]INT [flags=]STRING \
@ -885,7 +885,7 @@ _grow_instruction_prepare(Evas_Filter_Instruction *instr)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE);
EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcmp(instr->name, "grow"), EINA_FALSE); EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcasecmp(instr->name, "grow"), EINA_FALSE);
/* /*
* grow [radius=]INT (smooth=BOOL) (src=BUFFER) (dst=BUFFER) * grow [radius=]INT (smooth=BOOL) (src=BUFFER) (dst=BUFFER)
@ -906,7 +906,7 @@ _mask_instruction_prepare(Evas_Filter_Instruction *instr)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(instr->name, EINA_FALSE);
EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcmp(instr->name, "mask"), EINA_FALSE); EINA_SAFETY_ON_FALSE_RETURN_VAL(!strcasecmp(instr->name, "mask"), EINA_FALSE);
/* /*
* mask [mask=]BUFFER [input=BUFFER] [output=BUFFER] [color=COLOR] * mask [mask=]BUFFER [input=BUFFER] [output=BUFFER] [color=COLOR]
@ -1001,17 +1001,17 @@ _instruction_buffer_parse(Evas_Filter_Program *pgm,
EINA_INLIST_FOREACH(instr->params, param) EINA_INLIST_FOREACH(instr->params, param)
{ {
if (!bufname && !strcmp(param->name, "name")) if (!bufname && !strcasecmp(param->name, "name"))
{ {
PARSE_CHECK(eina_value_get(param->value, &bufname)); PARSE_CHECK(eina_value_get(param->value, &bufname));
found++; found++;
} }
else if ((alpha == -1) && !strcmp(param->name, "alpha")) else if ((alpha == -1) && !strcasecmp(param->name, "alpha"))
{ {
PARSE_CHECK(eina_value_get(param->value, &alpha)); PARSE_CHECK(eina_value_get(param->value, &alpha));
found++; found++;
} }
else if (param->set && !strcmp(param->name, "src")) else if (param->set && !strcasecmp(param->name, "src"))
{ {
PARSE_CHECK(eina_value_get(param->value, &src)); PARSE_CHECK(eina_value_get(param->value, &src));
found++; found++;
@ -1072,7 +1072,7 @@ evas_filter_program_parse(Evas_Filter_Program *pgm, const char *str)
ok = _instruction_parse(instr, token); ok = _instruction_parse(instr, token);
PARSE_CHECK(ok); PARSE_CHECK(ok);
if (!strcmp(instr->name, "buffer")) if (!strcasecmp(instr->name, "buffer"))
PARSE_CHECK(_instruction_buffer_parse(pgm, instr)); PARSE_CHECK(_instruction_buffer_parse(pgm, instr));
else else
{ {