enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

evas/cserve2: Make Font_Entry inherit from Entry. 

Also update some code paths to reflect the new type of entry.



SVN revision: 71364
This commit is contained in:
Rafael Antognolli 2012-05-23 18:10:32 +00:00
parent f17b43eb40
commit c0f46df5d3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,8 @@ struct _Request {
typedef enum {
CSERVE2_IMAGE_FILE,
CSERVE2_IMAGE_DATA
CSERVE2_IMAGE_DATA,
CSERVE2_FONT_ENTRY
} Entry_Type;
struct _Entry {
@ -90,6 +91,7 @@ struct _Font_Source {
};
struct _Font_Entry {
Entry *base;
unsigned int rend_flags;
unsigned int hint;
unsigned int size;
@ -277,6 +279,8 @@ _request_failed(Entry *e, Error_Type type)
hash = ref->client->files.referencing;
else if (e->type == CSERVE2_IMAGE_DATA)
hash = ref->client->images.referencing;
else
continue;
eina_hash_del_by_key(hash, &(ref->client_entry_id));
}
@ -912,7 +916,7 @@ _entry_free_cb(void *data)
if (entry->type == CSERVE2_IMAGE_FILE)
_request_answer_del(&open_requests, entry->request, ref->client,
CSERVE2_REQUEST_CANCEL);
else
else if (entry->type == CSERVE2_IMAGE_DATA)
{
if (((Image_Data *)entry)->doload)
_request_answer_del(&load_requests, entry->request,