From 4436026ac6b575abd428cdb2ee04b36550e29c42 Mon Sep 17 00:00:00 2001 From: rbdpngn Date: Thu, 15 Jan 2004 14:58:03 +0000 Subject: [PATCH] An instance of ft_lib was missed. SVN revision: 8444 --- legacy/evas/src/lib/engines/common/evas_font_draw.c | 2 -- legacy/evas/src/lib/engines/common/evas_font_load.c | 2 +- legacy/evas/src/lib/engines/common/evas_font_main.c | 6 +++--- legacy/evas/src/lib/engines/common/evas_font_query.c | 2 -- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/legacy/evas/src/lib/engines/common/evas_font_draw.c b/legacy/evas/src/lib/engines/common/evas_font_draw.c index 9438c4a227..2a2c70de81 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_draw.c +++ b/legacy/evas/src/lib/engines/common/evas_font_draw.c @@ -1,7 +1,5 @@ #include "evas_common.h" -extern FT_Library evas_ft_lib; - RGBA_Font_Glyph * evas_common_font_cache_glyph_get(RGBA_Font *fn, FT_UInt index) { diff --git a/legacy/evas/src/lib/engines/common/evas_font_load.c b/legacy/evas/src/lib/engines/common/evas_font_load.c index 6627cab9e6..9dfec993e0 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_load.c +++ b/legacy/evas/src/lib/engines/common/evas_font_load.c @@ -1,6 +1,6 @@ #include "evas_common.h" -FT_Library evas_ft_lib = 0; +extern FT_Library evas_ft_lib; static int font_cache_usage = 0; static int font_cache = 0; diff --git a/legacy/evas/src/lib/engines/common/evas_font_main.c b/legacy/evas/src/lib/engines/common/evas_font_main.c index 510b4b4d43..dcc8b90784 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_main.c +++ b/legacy/evas/src/lib/engines/common/evas_font_main.c @@ -1,6 +1,6 @@ #include "evas_common.h" -FT_Library ft_lib; +FT_Library evas_ft_lib = 0; static int initialised = 0; void @@ -10,7 +10,7 @@ evas_common_font_init(void) initialised++; if (initialised != 1) return; - error = FT_Init_FreeType(&ft_lib); + error = FT_Init_FreeType(&evas_ft_lib); if (error) { initialised--; @@ -25,7 +25,7 @@ evas_common_font_shutdown(void) initialised--; if (initialised != 0) return; - error = FT_Done_FreeType(ft_lib); + error = FT_Done_FreeType(evas_ft_lib); } int diff --git a/legacy/evas/src/lib/engines/common/evas_font_query.c b/legacy/evas/src/lib/engines/common/evas_font_query.c index db8ac2240b..bc1b938e80 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_query.c +++ b/legacy/evas/src/lib/engines/common/evas_font_query.c @@ -1,7 +1,5 @@ #include "evas_common.h" -extern FT_Library evas_ft_lib; - /* string extents */ void evas_common_font_query_size(RGBA_Font *fn, const char *text, int *w, int *h)