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

Evas: Fix more shadow declarations of 'index' variable. 

SVN revision: 59714
This commit is contained in:
Christopher Michael 2011-05-27 01:44:10 +00:00
parent 6379aa55aa
commit ffc97c3754
4 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/evas/src/lib/engines/common/evas_draw.h
View File

@ -21,7 +21,7 @@ EAPI void evas_common_draw_context_set_mask (RGBA_D
EAPI void evas_common_draw_context_unset_mask (RGBA_Draw_Context *dc); EAPI void evas_common_draw_context_unset_mask (RGBA_Draw_Context *dc);
EAPI Cutout_Rects *evas_common_draw_context_cutouts_new (void); EAPI Cutout_Rects *evas_common_draw_context_cutouts_new (void);
EAPI void evas_common_draw_context_cutouts_free (Cutout_Rects* rects); EAPI void evas_common_draw_context_cutouts_free (Cutout_Rects* rects);
EAPI void evas_common_draw_context_cutouts_del (Cutout_Rects* rects, int index); EAPI void evas_common_draw_context_cutouts_del (Cutout_Rects* rects, int idx);
EAPI void evas_common_draw_context_add_cutout (RGBA_Draw_Context *dc, int x, int y, int w, int h); EAPI void evas_common_draw_context_add_cutout (RGBA_Draw_Context *dc, int x, int y, int w, int h);
EAPI void evas_common_draw_context_clear_cutouts (RGBA_Draw_Context *dc); EAPI void evas_common_draw_context_clear_cutouts (RGBA_Draw_Context *dc);
EAPI Cutout_Rects *evas_common_draw_context_apply_cutouts (RGBA_Draw_Context *dc); EAPI Cutout_Rects *evas_common_draw_context_apply_cutouts (RGBA_Draw_Context *dc);

63
legacy/evas/src/lib/engines/common/evas_draw_main.c
View File

@ -18,16 +18,15 @@ evas_common_draw_context_cutouts_free(Cutout_Rects* rects)
} }
EAPI void EAPI void
evas_common_draw_context_cutouts_del(Cutout_Rects* rects, evas_common_draw_context_cutouts_del(Cutout_Rects* rects, int idx)
int index)
{ {
if ((index >= 0) && (index < rects->active)) if ((idx >= 0) && (idx < rects->active))
{ {
Cutout_Rect* rect; Cutout_Rect *rect;
rect = rects->rects + index; rect = rects->rects + idx;
memmove(rect, rect + 1, memmove(rect, rect + 1,
sizeof(Cutout_Rect) * (rects->active - index - 1)); sizeof(Cutout_Rect) * (rects->active - idx - 1));
rects->active--; rects->active--;
} }
} }
@ -212,10 +211,10 @@ evas_common_draw_context_add_cutout(RGBA_Draw_Context *dc, int x, int y, int w,
} }
int int
evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect *split) evas_common_draw_context_cutout_split(Cutout_Rects* res, int idx, Cutout_Rect *split)
{ {
/* 1 input rect, multiple out */ /* 1 input rect, multiple out */
Cutout_Rect in = res->rects[index]; Cutout_Rect in = res->rects[idx];
/* this is to save me a LOT of typing */ /* this is to save me a LOT of typing */
#define INX1 (in.x) #define INX1 (in.x)
@ -255,8 +254,8 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
R_NEW(res, in.x, SPY1, SPX1 - in.x, SPY2 - SPY1); R_NEW(res, in.x, SPY1, SPX1 - in.x, SPY2 - SPY1);
R_NEW(res, SPX2, SPY1, INX2 - SPX2, SPY2 - SPY1); R_NEW(res, SPX2, SPY1, INX2 - SPX2, SPY2 - SPY1);
/* out => (in.x, SPY2, in.w, INY2 - SPY2) */ /* out => (in.x, SPY2, in.w, INY2 - SPY2) */
res->rects[index].h = INY2 - SPY2; res->rects[idx].h = INY2 - SPY2;
res->rects[index].y = SPY2; res->rects[idx].y = SPY2;
return 1; return 1;
} }
/* SSSSSSS /* SSSSSSS
@ -269,7 +268,7 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
*/ */
if (!X1_IN && !X2_IN && !Y1_IN && !Y2_IN) if (!X1_IN && !X2_IN && !Y1_IN && !Y2_IN)
{ {
evas_common_draw_context_cutouts_del(res, index); evas_common_draw_context_cutouts_del(res, idx);
return 0; return 0;
} }
/* SSS /* SSS
@ -283,8 +282,8 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
if (!X1_IN && X2_IN && !Y1_IN && !Y2_IN) if (!X1_IN && X2_IN && !Y1_IN && !Y2_IN)
{ {
/* in => (SPX2, in.y, INX2 - SPX2, in.h) */ /* in => (SPX2, in.y, INX2 - SPX2, in.h) */
res->rects[index].w = INX2 - SPX2; res->rects[idx].w = INX2 - SPX2;
res->rects[index].x = SPX2; res->rects[idx].x = SPX2;
return 1; return 1;
} }
/* S /* S
@ -299,8 +298,8 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
{ {
R_NEW(res, in.x, in.y, SPX1 - in.x, in.h); R_NEW(res, in.x, in.y, SPX1 - in.x, in.h);
/* in => (SPX2, in.y, INX2 - SPX2, in.h) */ /* in => (SPX2, in.y, INX2 - SPX2, in.h) */
res->rects[index].w = INX2 - SPX2; res->rects[idx].w = INX2 - SPX2;
res->rects[index].x = SPX2; res->rects[idx].x = SPX2;
return 1; return 1;
} }
/* SSS /* SSS
@ -314,7 +313,7 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
if (X1_IN && !X2_IN && !Y1_IN && !Y2_IN) if (X1_IN && !X2_IN && !Y1_IN && !Y2_IN)
{ {
/* in => (in.x, in.y, SPX1 - in.x, in.h) */ /* in => (in.x, in.y, SPX1 - in.x, in.h) */
res->rects[index].w = SPX1 - in.x; res->rects[idx].w = SPX1 - in.x;
return 1; return 1;
} }
/* SSSSSSS /* SSSSSSS
@ -328,8 +327,8 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
if (!X1_IN && !X2_IN && !Y1_IN && Y2_IN) if (!X1_IN && !X2_IN && !Y1_IN && Y2_IN)
{ {
/* in => (in.x, SPY2, in.w, INY2 - SPY2) */ /* in => (in.x, SPY2, in.w, INY2 - SPY2) */
res->rects[index].h = INY2 - SPY2; res->rects[idx].h = INY2 - SPY2;
res->rects[index].y = SPY2; res->rects[idx].y = SPY2;
return 1; return 1;
} }
/* /*
@ -344,7 +343,7 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
{ {
R_NEW(res, in.x, SPY2, in.w, INY2 - SPY2); R_NEW(res, in.x, SPY2, in.w, INY2 - SPY2);
/* in => (in.x, in.y, in.w, SPY1 - in.y) */ /* in => (in.x, in.y, in.w, SPY1 - in.y) */
res->rects[index].h = SPY1 - in.y; res->rects[idx].h = SPY1 - in.y;
return 1; return 1;
} }
/* /*
@ -358,7 +357,7 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
if (!X1_IN && !X2_IN && Y1_IN && !Y2_IN) if (!X1_IN && !X2_IN && Y1_IN && !Y2_IN)
{ {
/* in => (in.x, in.y, in.w, SPY1 - in.y) */ /* in => (in.x, in.y, in.w, SPY1 - in.y) */
res->rects[index].h = SPY1 - in.y; res->rects[idx].h = SPY1 - in.y;
return 1; return 1;
} }
/* SSS /* SSS
@ -373,8 +372,8 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
{ {
R_NEW(res, SPX2, in.y, INX2 - SPX2, SPY2 - in.y); R_NEW(res, SPX2, in.y, INX2 - SPX2, SPY2 - in.y);
/* in => (in.x, SPY2, in.w, INY2 - SPY2) */ /* in => (in.x, SPY2, in.w, INY2 - SPY2) */
res->rects[index].h = INY2 - SPY2; res->rects[idx].h = INY2 - SPY2;
res->rects[index].y = SPY2; res->rects[idx].y = SPY2;
return 1; return 1;
} }
/* S /* S
@ -390,8 +389,8 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
R_NEW(res, in.x, in.y, SPX1 - in.x, SPY2 - in.y); R_NEW(res, in.x, in.y, SPX1 - in.x, SPY2 - in.y);
R_NEW(res, SPX2, in.y, INX2 - SPX2, SPY2 - in.y); R_NEW(res, SPX2, in.y, INX2 - SPX2, SPY2 - in.y);
/* in => (in.x, SPY2, in.w, INY2 - SPY2) */ /* in => (in.x, SPY2, in.w, INY2 - SPY2) */
res->rects[index].h = INY2 - SPY2; res->rects[idx].h = INY2 - SPY2;
res->rects[index].y = SPY2; res->rects[idx].y = SPY2;
return 1; return 1;
} }
/* SSS /* SSS
@ -406,8 +405,8 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
{ {
R_NEW(res, in.x, in.y, SPX1 - in.x, SPY2 - in.y); R_NEW(res, in.x, in.y, SPX1 - in.x, SPY2 - in.y);
/* in => (in.x, SPY2, in.w, INY2 - SPY2) */ /* in => (in.x, SPY2, in.w, INY2 - SPY2) */
res->rects[index].h = INY2 - SPY2; res->rects[idx].h = INY2 - SPY2;
res->rects[index].y = SPY2; res->rects[idx].y = SPY2;
return 1; return 1;
} }
/* /*
@ -423,7 +422,7 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
R_NEW(res, in.x, SPY2, in.w, INY2 - SPY2); R_NEW(res, in.x, SPY2, in.w, INY2 - SPY2);
R_NEW(res, SPX2, SPY1, INX2 - SPX2, SPY2 - SPY1); R_NEW(res, SPX2, SPY1, INX2 - SPX2, SPY2 - SPY1);
/* in => (in.x, SPY2, in.w, INY2 - SPY2) */ /* in => (in.x, SPY2, in.w, INY2 - SPY2) */
res->rects[index].h = SPY1 - in.y; res->rects[idx].h = SPY1 - in.y;
return 1; return 1;
} }
/* /*
@ -439,7 +438,7 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
R_NEW(res, in.x, SPY2, in.w, INY2 - SPY2); R_NEW(res, in.x, SPY2, in.w, INY2 - SPY2);
R_NEW(res, in.x, SPY1, SPX1 - in.x, SPY2 - SPY1); R_NEW(res, in.x, SPY1, SPX1 - in.x, SPY2 - SPY1);
/* in => (in.x, in.y, in.w, SPY1 - in.y) */ /* in => (in.x, in.y, in.w, SPY1 - in.y) */
res->rects[index].h = SPY1 - in.y; res->rects[idx].h = SPY1 - in.y;
return 1; return 1;
} }
/* /*
@ -454,7 +453,7 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
{ {
R_NEW(res, SPX2, SPY1, INX2 - SPX2, INY2 - SPY1); R_NEW(res, SPX2, SPY1, INX2 - SPX2, INY2 - SPY1);
/* in => (in.x, in.y, in.w, SPY1 - in.y) */ /* in => (in.x, in.y, in.w, SPY1 - in.y) */
res->rects[index].h = SPY1 - in.y; res->rects[idx].h = SPY1 - in.y;
return 1; return 1;
} }
/* /*
@ -470,7 +469,7 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
R_NEW(res, in.x, SPY1, SPX1 - in.x, INY2 - SPY1); R_NEW(res, in.x, SPY1, SPX1 - in.x, INY2 - SPY1);
R_NEW(res, SPX2, SPY1, INX2 - SPX2, INY2 - SPY1); R_NEW(res, SPX2, SPY1, INX2 - SPX2, INY2 - SPY1);
/* in => (in.x, in.y, in.w, SPY1 - in.y) */ /* in => (in.x, in.y, in.w, SPY1 - in.y) */
res->rects[index].h = SPY1 - in.y; res->rects[idx].h = SPY1 - in.y;
return 1; return 1;
} }
/* /*
@ -485,10 +484,10 @@ evas_common_draw_context_cutout_split(Cutout_Rects* res, int index, Cutout_Rect
{ {
R_NEW(res, in.x, SPY1, SPX1 - in.x, INY2 - SPY1); R_NEW(res, in.x, SPY1, SPX1 - in.x, INY2 - SPY1);
/* in => (in.x, in.y, in.w, SPY1 - in.y) */ /* in => (in.x, in.y, in.w, SPY1 - in.y) */
res->rects[index].h = SPY1 - in.y; res->rects[idx].h = SPY1 - in.y;
return 1; return 1;
} }
evas_common_draw_context_cutouts_del(res, index); evas_common_draw_context_cutouts_del(res, idx);
return 0; return 0;
#undef INX1 #undef INX1
#undef INX2 #undef INX2

7
legacy/evas/src/lib/engines/common/evas_font_draw.c
View File

@ -195,15 +195,16 @@ evas_common_font_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font
EVAS_FONT_WALK_TEXT_START() EVAS_FONT_WALK_TEXT_START()
{ {
FT_UInt index; FT_UInt idx;
RGBA_Font_Glyph *fg; RGBA_Font_Glyph *fg;
int chr_x, chr_y, chr_w; int chr_x, chr_y, chr_w;
if (!EVAS_FONT_WALK_IS_VISIBLE) continue; if (!EVAS_FONT_WALK_IS_VISIBLE) continue;
index = EVAS_FONT_WALK_INDEX; idx = EVAS_FONT_WALK_INDEX;
LKL(fi->ft_mutex); LKL(fi->ft_mutex);
fg = evas_common_font_int_cache_glyph_get(fi, index); fg = evas_common_font_int_cache_glyph_get(fi, idx);
if (!fg) if (!fg)
{ {
LKU(fi->ft_mutex); LKU(fi->ft_mutex);

37
legacy/evas/src/lib/engines/common/evas_font_main.c
View File

@ -254,7 +254,7 @@ _fash_int_find(Fash_Int *fash, int item)
} }
static void static void
_fash_int_add(Fash_Int *fash, int item, RGBA_Font_Int *fint, int index) _fash_int_add(Fash_Int *fash, int item, RGBA_Font_Int *fint, int idx)
{ {
int grp, maj, min; int grp, maj, min;
@ -269,7 +269,7 @@ _fash_int_add(Fash_Int *fash, int item, RGBA_Font_Int *fint, int index)
fash->bucket[grp]->bucket[maj] = calloc(1, sizeof(Fash_Int_Map)); fash->bucket[grp]->bucket[maj] = calloc(1, sizeof(Fash_Int_Map));
EINA_SAFETY_ON_NULL_RETURN(fash->bucket[grp]->bucket[maj]); EINA_SAFETY_ON_NULL_RETURN(fash->bucket[grp]->bucket[maj]);
fash->bucket[grp]->bucket[maj]->item[min].fint = fint; fash->bucket[grp]->bucket[maj]->item[min].fint = fint;
fash->bucket[grp]->bucket[maj]->item[min].index = index; fash->bucket[grp]->bucket[maj]->item[min].index = idx;
} }
static void static void
@ -331,7 +331,7 @@ _fash_gl_add(Fash_Glyph *fash, int item, RGBA_Font_Glyph *glyph)
} }
EAPI RGBA_Font_Glyph * EAPI RGBA_Font_Glyph *
evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt index) evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt idx)
{ {
RGBA_Font_Glyph *fg; RGBA_Font_Glyph *fg;
FT_UInt hindex; FT_UInt hindex;
@ -344,26 +344,26 @@ evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt index)
evas_common_font_int_promote(fi); evas_common_font_int_promote(fi);
if (fi->fash) if (fi->fash)
{ {
fg = _fash_gl_find(fi->fash, index); fg = _fash_gl_find(fi->fash, idx);
if (fg == (void *)(-1)) return NULL; if (fg == (void *)(-1)) return NULL;
else if (fg) return fg; else if (fg) return fg;
} }
hindex = index + (fi->hinting * 500000000); hindex = idx + (fi->hinting * 500000000);
// fg = eina_hash_find(fi->glyphs, &hindex); // fg = eina_hash_find(fi->glyphs, &hindex);
// if (fg) return fg; // if (fg) return fg;
evas_common_font_int_reload(fi); evas_common_font_int_reload(fi);
FTLOCK(); FTLOCK();
error = FT_Load_Glyph(fi->src->ft.face, index, error = FT_Load_Glyph(fi->src->ft.face, idx,
FT_LOAD_DEFAULT | FT_LOAD_NO_BITMAP | FT_LOAD_DEFAULT | FT_LOAD_NO_BITMAP |
hintflags[fi->hinting]); hintflags[fi->hinting]);
FTUNLOCK(); FTUNLOCK();
if (error) if (error)
{ {
if (!fi->fash) fi->fash = _fash_gl_new(); if (!fi->fash) fi->fash = _fash_gl_new();
if (fi->fash) _fash_gl_add(fi->fash, index, (void *)(-1)); if (fi->fash) _fash_gl_add(fi->fash, idx, (void *)(-1));
return NULL; return NULL;
} }
@ -386,7 +386,7 @@ evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt index)
{ {
free(fg); free(fg);
if (!fi->fash) fi->fash = _fash_gl_new(); if (!fi->fash) fi->fash = _fash_gl_new();
if (fi->fash) _fash_gl_add(fi->fash, index, (void *)(-1)); if (fi->fash) _fash_gl_add(fi->fash, idx, (void *)(-1));
return NULL; return NULL;
} }
@ -398,7 +398,7 @@ evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt index)
FTUNLOCK(); FTUNLOCK();
free(fg); free(fg);
if (!fi->fash) fi->fash = _fash_gl_new(); if (!fi->fash) fi->fash = _fash_gl_new();
if (fi->fash) _fash_gl_add(fi->fash, index, (void *)(-1)); if (fi->fash) _fash_gl_add(fi->fash, idx, (void *)(-1));
return NULL; return NULL;
} }
FTUNLOCK(); FTUNLOCK();
@ -408,7 +408,7 @@ evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt index)
fg->fi = fi; fg->fi = fi;
if (!fi->fash) fi->fash = _fash_gl_new(); if (!fi->fash) fi->fash = _fash_gl_new();
if (fi->fash) _fash_gl_add(fi->fash, index, fg); if (fi->fash) _fash_gl_add(fi->fash, idx, fg);
/* This '+ 200' is just an estimation of how much memory freetype will use /* This '+ 200' is just an estimation of how much memory freetype will use
* on it's size. This value is not really used anywhere in code - it's * on it's size. This value is not really used anywhere in code - it's
* only for statistics. */ * only for statistics. */
@ -487,7 +487,7 @@ evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicod
for (l = fn->fonts; l; l = l->next) for (l = fn->fonts; l; l = l->next)
{ {
RGBA_Font_Int *fi; RGBA_Font_Int *fi;
int index; int idx;
fi = l->data; fi = l->data;
@ -495,8 +495,8 @@ evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicod
/* /*
if (fi->src->charmap) // Charmap loaded, FI/FS blank if (fi->src->charmap) // Charmap loaded, FI/FS blank
{ {
index = evas_array_hash_search(fi->src->charmap, gl); idx = evas_array_hash_search(fi->src->charmap, gl);
if (index != 0) if (idx != 0)
{ {
evas_common_font_source_load_complete(fi->src); evas_common_font_source_load_complete(fi->src);
evas_common_font_int_load_complete(fi); evas_common_font_int_load_complete(fi);
@ -505,7 +505,7 @@ evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicod
fi->src->charmap = NULL; fi->src->charmap = NULL;
*fi_ret = fi; *fi_ret = fi;
return index; return idx;
} }
} }
else else
@ -517,15 +517,15 @@ evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicod
} }
if (fi->src->ft.face) if (fi->src->ft.face)
{ {
index = evas_common_get_char_index(fi, gl); idx = evas_common_get_char_index(fi, gl);
if (index != 0) if (idx != 0)
{ {
if (!fi->ft.size) if (!fi->ft.size)
evas_common_font_int_load_complete(fi); evas_common_font_int_load_complete(fi);
if (!fn->fash) fn->fash = _fash_int_new(); if (!fn->fash) fn->fash = _fash_int_new();
if (fn->fash) _fash_int_add(fn->fash, gl, fi, index); if (fn->fash) _fash_int_add(fn->fash, gl, fi, idx);
*fi_ret = fi; *fi_ret = fi;
return index; return idx;
} }
else else
{ {
@ -536,4 +536,3 @@ evas_common_font_glyph_search(RGBA_Font *fn, RGBA_Font_Int **fi_ret, Eina_Unicod
} }
return 0; return 0;
} }