enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

evas/cserve2: Change our fash implemenation name. 

So the names won't clash.



SVN revision: 72701
This commit is contained in:
Rafael Antognolli 2012-06-22 20:56:53 +00:00
parent 2f3426b67c
commit 0b675aae17
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/evas/src/bin/evas_cserve2_cache.c
View File

@ -108,7 +108,7 @@ struct _Font_Entry {
unsigned int dpi;
Font_Source *src;
void *ft;
Fash_Glyph *glyphs;
Fash_Glyph2 *glyphs;
Eina_Inlist *caches;
Font_Cache *last_cache;
Eina_Bool unused : 1;

8
legacy/evas/src/lib/cserve2/evas_cs2_client.c
View File

@ -792,7 +792,7 @@ struct _Font_Entry
unsigned int rid; // open
Eina_Hash *glyphs_maps;
Fash_Glyph *fash[3]; // one per hinting value
Fash_Glyph2 *fash[3]; // one per hinting value
Eina_Clist glyphs_queue;
int glyphs_queue_count;
@ -1163,7 +1163,7 @@ _glyph_request_server_send(Font_Entry *fe, Font_Hint_Flags hints, Eina_Bool used
Eina_Bool
evas_cserve2_font_glyph_request(Font_Entry *fe, unsigned int idx, Font_Hint_Flags hints)
{
Fash_Glyph *fash;
Fash_Glyph2 *fash;
CS_Glyph_Out *glyph;
if (fe->rid)
@ -1208,7 +1208,7 @@ evas_cserve2_font_glyph_request(Font_Entry *fe, unsigned int idx, Font_Hint_Flag
Eina_Bool
evas_cserve2_font_glyph_used(Font_Entry *fe, unsigned int idx, Font_Hint_Flags hints)
{
Fash_Glyph *fash;
Fash_Glyph2 *fash;
CS_Glyph_Out *glyph;
if (fe->rid)
@ -1244,7 +1244,7 @@ evas_cserve2_font_glyph_used(Font_Entry *fe, unsigned int idx, Font_Hint_Flags h
RGBA_Font_Glyph_Out *
evas_cserve2_font_glyph_bitmap_get(Font_Entry *fe, unsigned int idx, Font_Hint_Flags hints)
{
Fash_Glyph *fash;
Fash_Glyph2 *fash;
CS_Glyph_Out *out;
if (fe->failed)

18
legacy/evas/src/lib/cserve2/evas_cs2_utils.c
View File

@ -23,14 +23,14 @@ struct _Fash_Glyph_Map2
Fash_Glyph_Map *bucket[256];
};
struct _Fash_Glyph
struct _Fash_Glyph2
{
Fash_Glyph_Map2 *bucket[256];
void (*free_cb)(void *glyph);
};
static void
_fash_item_free(Fash_Glyph *fash, Fash_Glyph_Map *map)
_fash_item_free(Fash_Glyph2 *fash, Fash_Glyph_Map *map)
{
int i;
@ -42,7 +42,7 @@ _fash_item_free(Fash_Glyph *fash, Fash_Glyph_Map *map)
}
static void
_fash_gl2_free(Fash_Glyph *fash, Fash_Glyph_Map2 *fash2)
_fash_gl2_free(Fash_Glyph2 *fash, Fash_Glyph_Map2 *fash2)
{
int i;
@ -52,7 +52,7 @@ _fash_gl2_free(Fash_Glyph *fash, Fash_Glyph_Map2 *fash2)
}
void
fash_gl_free(Fash_Glyph *fash)
fash_gl_free(Fash_Glyph2 *fash)
{
int i;
@ -61,16 +61,16 @@ fash_gl_free(Fash_Glyph *fash)
free(fash);
}
Fash_Glyph *
Fash_Glyph2 *
fash_gl_new(void (*free_cb)(void *glyph))
{
Fash_Glyph *fash = calloc(1, sizeof(Fash_Glyph));
Fash_Glyph2 *fash = calloc(1, sizeof(Fash_Glyph2));
fash->free_cb = free_cb;
return fash;
}
void *
fash_gl_find(Fash_Glyph *fash, int item)
fash_gl_find(Fash_Glyph2 *fash, int item)
{
int grp, maj, min;
@ -84,7 +84,7 @@ fash_gl_find(Fash_Glyph *fash, int item)
}
void
fash_gl_add(Fash_Glyph *fash, int item, void *glyph)
fash_gl_add(Fash_Glyph2 *fash, int item, void *glyph)
{
int grp, maj, min;
@ -102,7 +102,7 @@ fash_gl_add(Fash_Glyph *fash, int item, void *glyph)
}
void
fash_gl_del(Fash_Glyph *fash, int item)
fash_gl_del(Fash_Glyph2 *fash, int item)
{
int grp, maj, min;
void *data;

12
legacy/evas/src/lib/cserve2/evas_cs2_utils.h
View File

@ -2,12 +2,12 @@
#ifndef _EVAS_CSERVE2_UTILS_H_
#define _EVAS_CSERVE2_UTILS_H_
typedef struct _Fash_Glyph Fash_Glyph;
typedef struct _Fash_Glyph2 Fash_Glyph2;
Fash_Glyph *fash_gl_new(void (*free_cb)(void *glyph));
void fash_gl_free(Fash_Glyph *fash);
void *fash_gl_find(Fash_Glyph *fash, int item);
void fash_gl_add(Fash_Glyph *fash, int item, void *glyph);
void fash_gl_del(Fash_Glyph *fash, int item);
Fash_Glyph2 *fash_gl_new(void (*free_cb)(void *glyph));
void fash_gl_free(Fash_Glyph2 *fash);
void *fash_gl_find(Fash_Glyph2 *fash, int item);
void fash_gl_add(Fash_Glyph2 *fash, int item, void *glyph);
void fash_gl_del(Fash_Glyph2 *fash, int item);
#endif /* EVAS_CSERVE2_UTILS_H_ */