Update functions to match ecore_hash.

Add missing function declaration.
Use signed int for width and height.


SVN revision: 16445
This commit is contained in:
sebastid 2005-08-31 17:33:32 +00:00 committed by sebastid
parent 1f0a680d7f
commit 044b599af0
3 changed files with 9 additions and 5 deletions

View File

@ -1,4 +1,6 @@
#include "evas_common.h"
/* The freetype size functions are not normally exported */
#include <freetype/ftsizes.h>
extern FT_Library evas_ft_lib;
@ -7,8 +9,8 @@ static int font_cache = 0;
static Evas_Object_List * fonts_src = NULL;
static Evas_Object_List * fonts = NULL;
static int font_modify_cache_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
static int font_flush_free_glyph_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
static Evas_Bool font_modify_cache_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
static Evas_Bool font_flush_free_glyph_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
RGBA_Font_Source *
evas_common_font_source_memory_load(const char *name, const void *data, int data_size)
@ -388,7 +390,7 @@ evas_common_font_free(RGBA_Font *fn)
free(fn);
}
static int
static Evas_Bool
font_modify_cache_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
{
int *dir;
@ -435,7 +437,7 @@ evas_common_font_flush(void)
while (font_cache_usage > font_cache) evas_common_font_flush_last();
}
static int
static Evas_Bool
font_flush_free_glyph_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
{
RGBA_Font_Glyph *fg;

View File

@ -602,7 +602,8 @@ static int load_image_file_data_eet(RGBA_Image *im, const char *file, const char
static int
load_image_file_data_eet(RGBA_Image *im, const char *file, const char *key)
{
int w, h, alpha, compression, quality, lossy;
unsigned int w, h;
int alpha, compression, quality, lossy;
Eet_File *ef;
DATA32 *body;

View File

@ -558,6 +558,7 @@ void evas_object_render_pre_effect_updates(Evas_List *updates, Evas_Object *obj,
Evas_List * evas_rects_return_difference_rects(int x, int y, int w, int h, int xx, int yy, int ww, int hh);
void evas_object_clip_recalc(Evas_Object *obj);
void evas_object_clip_dirty(Evas_Object *obj);
void evas_object_recalc_clippees(Evas_Object *obj);
Evas_Layer *evas_layer_new(Evas *e);
void evas_layer_pre_free(Evas_Layer *lay);
void evas_layer_free(Evas_Layer *lay);