From: antognolli Date: Wed, 23 May 2012 18:10:32 +0000 (+0000) Subject: evas/cserve2: Make Font_Entry inherit from Entry. X-Git-Tag: accepted/2.0/20130306.225542~52^2~102 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6c3e501447f59a98a5378ca4671b8a97a96ed9f;p=profile%2Fivi%2Fevas.git evas/cserve2: Make Font_Entry inherit from Entry. Also update some code paths to reflect the new type of entry. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@71364 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/bin/evas_cserve2_cache.c b/src/bin/evas_cserve2_cache.c index 2870b4d..b442725 100644 --- a/src/bin/evas_cserve2_cache.c +++ b/src/bin/evas_cserve2_cache.c @@ -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,