On Tue, Oct 16, 2012 at 6:04 AM, Enlightenment SVN
<no-re...@enlightenment.org> wrote:
> Log:
> font loader for eet now not an option in code even - no ifdefs.
>
>
>
> Author: raster
> Date: 2012-10-15 21:04:27 -0700 (Mon, 15 Oct 2012)
> New Revision: 78032
> Trac: http://trac.enlightenment.org/e/changeset/78032
>
> Modified:
> trunk/evas/configure.ac trunk/evas/src/bin/evas_cserve2_fonts.c
> trunk/evas/src/lib/canvas/evas_font_dir.c
>
> Modified: trunk/evas/configure.ac
> ===================================================================
> --- trunk/evas/configure.ac 2012-10-16 04:00:18 UTC (rev 78031)
> +++ trunk/evas/configure.ac 2012-10-16 04:04:27 UTC (rev 78032)
> @@ -815,7 +815,6 @@
> ## Font Loaders
>
> PKG_CHECK_MODULES([EET], [eet >= 1.7.0], [], [AC_MSG_ERROR([EET not found])])
just use PKG_CHECK_MODULES([EET], [eet >= 1.7.0])
Vincent
> -AC_DEFINE([BUILD_FONT_LOADER_EET], [1], [EET Font Loader Support])
> requirement_evas="eet >= 1.7.0 ${requirement_evas}"
>
> #####################################################################
>
> Modified: trunk/evas/src/bin/evas_cserve2_fonts.c
> ===================================================================
> --- trunk/evas/src/bin/evas_cserve2_fonts.c 2012-10-16 04:00:18 UTC (rev
> 78031)
> +++ trunk/evas/src/bin/evas_cserve2_fonts.c 2012-10-16 04:04:27 UTC (rev
> 78032)
> @@ -6,9 +6,7 @@
> #include <sys/time.h>
> #endif
>
> -#ifdef BUILD_FONT_LOADER_EET
> #include <Eet.h>
> -#endif
>
> #include <ft2build.h>
> #include FT_FREETYPE_H
> @@ -99,7 +97,6 @@
> return NULL;
> }
> }
> -#ifdef BUILD_FONT_LOADER_EET
> else
> {
> Eet_File *ef;
> @@ -131,7 +128,6 @@
> return NULL;
> }
> }
> -#endif
>
> error = FT_Select_Charmap(fsi->face, ft_encoding_unicode);
> if (error)
> @@ -600,9 +596,7 @@
> error = FT_Init_FreeType(&cserve2_ft_lib);
> if (error) return;
>
> -#ifdef BUILD_FONT_LOADER_EET
> eet_init();
> -#endif
> }
>
> void
> @@ -619,9 +613,7 @@
> FT_Done_FreeType(cserve2_ft_lib);
> cserve2_ft_lib = 0;
>
> -#ifdef BUILD_FONT_LOADER_EET
> eet_shutdown();
> -#endif
> }
>
> void
>
> Modified: trunk/evas/src/lib/canvas/evas_font_dir.c
> ===================================================================
> --- trunk/evas/src/lib/canvas/evas_font_dir.c 2012-10-16 04:00:18 UTC (rev
> 78031)
> +++ trunk/evas/src/lib/canvas/evas_font_dir.c 2012-10-16 04:04:27 UTC (rev
> 78032)
> @@ -6,9 +6,7 @@
> # include <Evil.h>
> #endif
>
> -#ifdef BUILD_FONT_LOADER_EET
> #include <Eet.h>
> -#endif
>
> #ifdef HAVE_FONTCONFIG
> #include <fontconfig/fontconfig.h>
> @@ -593,7 +591,6 @@
> {
> if (l == fonts || !font) /* First iteration OR no font */
> {
> -#ifdef BUILD_FONT_LOADER_EET
> if (source) /* Load Font from "eet" source */
> {
> Eet_File *ef;
> @@ -626,7 +623,6 @@
> }
> if (!font) /* Source load failed */
> {
> -#endif
> 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);
> else /* search font path */
> @@ -646,13 +642,10 @@
> }
> }
> }
> -#ifdef BUILD_FONT_LOADER_EET
> }
> -#endif
> }
> else /* Base font loaded, append others */
> {
> -#ifdef BUILD_FONT_LOADER_EET
> void *ok = NULL;
>
> if (source)
> @@ -689,7 +682,6 @@
> }
> if (!ok)
> {
> -#endif
> if (evas_file_path_is_full_path((char *)nm))
> evas->engine.func->font_add(evas->engine.data.output,
> font, (char *)nm, size, wanted_rend);
> else
> @@ -709,9 +701,7 @@
> }
> }
> }
> -#ifdef BUILD_FONT_LOADER_EET
> }
> -#endif
> }
> eina_stringshare_del(nm);
> }
>
>
> ------------------------------------------------------------------------------
> Don't let slow site performance ruin your business. Deploy New Relic APM
> Deploy New Relic app performance management and know exactly
> what is happening inside your Ruby, Python, PHP, Java, and .NET app
> Try New Relic at no cost today and get our sweet Data Nerd shirt too!
> http://p.sf.net/sfu/newrelic-dev2dev
> _______________________________________________
> enlightenment-svn mailing list
> enlightenment-...@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
