From: <enl...@li...> - 2004-01-15 06:27:50
|
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/common Modified Files: evas_font_draw.c evas_font_load.c evas_font_query.c Log Message: Renamed a variable to avoid a collision with an imlib2 global. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_font_draw.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- evas_font_draw.c 10 Sep 2003 14:33:38 -0000 1.6 +++ evas_font_draw.c 15 Jan 2004 06:27:44 -0000 1.7 @@ -1,6 +1,6 @@ #include "evas_common.h" -extern FT_Library ft_lib; +extern FT_Library evas_ft_lib; RGBA_Font_Glyph * evas_common_font_cache_glyph_get(RGBA_Font *fn, FT_UInt index) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_font_load.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- evas_font_load.c 9 Sep 2003 05:51:02 -0000 1.3 +++ evas_font_load.c 15 Jan 2004 06:27:44 -0000 1.4 @@ -1,6 +1,6 @@ #include "evas_common.h" -extern FT_Library ft_lib; +FT_Library evas_ft_lib = 0; static int font_cache_usage = 0; static int font_cache = 0; @@ -26,7 +26,7 @@ fn = malloc(sizeof(RGBA_Font)); file = (char *)name; - error = FT_New_Face(ft_lib, file, 0, &(fn->ft.face)); + error = FT_New_Face(evas_ft_lib, file, 0, &(fn->ft.face)); if (error) { free(fn); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_font_query.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- evas_font_query.c 7 Jun 2003 02:32:30 -0000 1.8 +++ evas_font_query.c 15 Jan 2004 06:27:44 -0000 1.9 @@ -1,6 +1,6 @@ #include "evas_common.h" -extern FT_Library ft_lib; +extern FT_Library evas_ft_lib; /* string extents */ void |