Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_font_load.c evas_image_load.c
Log Message:
Update functions to match ecore_hash.
Add missing function declaration.
Use signed int for width and height.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_font_load.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- evas_font_load.c 26 Aug 2005 08:00:49 -0000 1.21
+++ evas_font_load.c 31 Aug 2005 17:33:32 -0000 1.22
@@ -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 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 @@
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 @@
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;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_image_load.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- evas_image_load.c 18 Jun 2005 01:00:31 -0000 1.20
+++ evas_image_load.c 31 Aug 2005 17:33:32 -0000 1.21
@@ -602,7 +602,8 @@
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;
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
