orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

font loader for eet now not an option in code even - no ifdefs. 

SVN revision: 78032
This commit is contained in:
Carsten Haitzler 2012-10-16 04:04:27 +00:00
parent 8c088a95dd
commit 68fcefc97b
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/evas/configure.ac
View File

@ -815,7 +815,6 @@ fi
## Font Loaders ## Font Loaders
PKG_CHECK_MODULES([EET], [eet >= 1.7.0], [], [AC_MSG_ERROR([EET not found])]) PKG_CHECK_MODULES([EET], [eet >= 1.7.0], [], [AC_MSG_ERROR([EET not found])])
AC_DEFINE([BUILD_FONT_LOADER_EET], [1], [EET Font Loader Support])
requirement_evas="eet >= 1.7.0 ${requirement_evas}" requirement_evas="eet >= 1.7.0 ${requirement_evas}"
##################################################################### #####################################################################

8
legacy/evas/src/bin/evas_cserve2_fonts.c
View File

@ -6,9 +6,7 @@
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#ifdef BUILD_FONT_LOADER_EET
#include <Eet.h> #include <Eet.h>
#endif
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
@ -99,7 +97,6 @@ _font_slave_source_load(const char *file, const char *name)
return NULL; return NULL;
} }
} }
#ifdef BUILD_FONT_LOADER_EET
else else
{ {
Eet_File *ef; Eet_File *ef;
@ -131,7 +128,6 @@ _font_slave_source_load(const char *file, const char *name)
return NULL; return NULL;
} }
} }
#endif
error = FT_Select_Charmap(fsi->face, ft_encoding_unicode); error = FT_Select_Charmap(fsi->face, ft_encoding_unicode);
if (error) if (error)
@ -600,9 +596,7 @@ cserve2_font_init(void)
error = FT_Init_FreeType(&cserve2_ft_lib); error = FT_Init_FreeType(&cserve2_ft_lib);
if (error) return; if (error) return;
#ifdef BUILD_FONT_LOADER_EET
eet_init(); eet_init();
#endif
} }
void void
@ -619,9 +613,7 @@ cserve2_font_shutdown(void)
FT_Done_FreeType(cserve2_ft_lib); FT_Done_FreeType(cserve2_ft_lib);
cserve2_ft_lib = 0; cserve2_ft_lib = 0;
#ifdef BUILD_FONT_LOADER_EET
eet_shutdown(); eet_shutdown();
#endif
} }
void void

10
legacy/evas/src/lib/canvas/evas_font_dir.c
View File

@ -6,9 +6,7 @@
# include <Evil.h> # include <Evil.h>
#endif #endif
#ifdef BUILD_FONT_LOADER_EET
#include <Eet.h> #include <Eet.h>
#endif
#ifdef HAVE_FONTCONFIG #ifdef HAVE_FONTCONFIG
#include <fontconfig/fontconfig.h> #include <fontconfig/fontconfig.h>
@ -593,7 +591,6 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
{ {
if (l == fonts || !font) /* First iteration OR no font */ if (l == fonts || !font) /* First iteration OR no font */
{ {
#ifdef BUILD_FONT_LOADER_EET
if (source) /* Load Font from "eet" source */ if (source) /* Load Font from "eet" source */
{ {
Eet_File *ef; Eet_File *ef;
@ -626,7 +623,6 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
} }
if (!font) /* Source load failed */ if (!font) /* Source load failed */
{ {
#endif
if (evas_file_path_is_full_path((char *)nm)) /* Try filename */ if (evas_file_path_is_full_path((char *)nm)) /* Try filename */
font = evas->engine.func->font_load(evas->engine.data.output, (char *)nm, size, wanted_rend); font = evas->engine.func->font_load(evas->engine.data.output, (char *)nm, size, wanted_rend);
else /* search font path */ else /* search font path */
@ -646,13 +642,10 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
} }
} }
} }
#ifdef BUILD_FONT_LOADER_EET
} }
#endif
} }
else /* Base font loaded, append others */ else /* Base font loaded, append others */
{ {
#ifdef BUILD_FONT_LOADER_EET
void *ok = NULL; void *ok = NULL;
if (source) if (source)
@ -689,7 +682,6 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
} }
if (!ok) if (!ok)
{ {
#endif
if (evas_file_path_is_full_path((char *)nm)) if (evas_file_path_is_full_path((char *)nm))
evas->engine.func->font_add(evas->engine.data.output, font, (char *)nm, size, wanted_rend); evas->engine.func->font_add(evas->engine.data.output, font, (char *)nm, size, wanted_rend);
else else
@ -709,9 +701,7 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
} }
} }
} }
#ifdef BUILD_FONT_LOADER_EET
} }
#endif
} }
eina_stringshare_del(nm); eina_stringshare_del(nm);
} }