summaryrefslogtreecommitdiff
path: root/legacy/evas
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-10-16 04:04:27 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-10-16 04:04:27 +0000
commit68fcefc97b1c7916b9d7bf9df0a6f5ef342235e1 (patch)
treef8a8a597fbfdefd492a87217757511cccf36bcf4 /legacy/evas
parent8c088a95dd5cfa8aa00b248d6701c46af7568fc8 (diff)
font loader for eet now not an option in code even - no ifdefs.
SVN revision: 78032
Diffstat (limited to 'legacy/evas')
-rw-r--r--legacy/evas/configure.ac1
-rw-r--r--legacy/evas/src/bin/evas_cserve2_fonts.c8
-rw-r--r--legacy/evas/src/lib/canvas/evas_font_dir.c10
3 files changed, 0 insertions, 19 deletions
diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac
index 7be1cbbca8..3dc64a2322 100644
--- a/legacy/evas/configure.ac
+++ b/legacy/evas/configure.ac
@@ -815,7 +815,6 @@ fi
815## Font Loaders 815## Font Loaders
816 816
817PKG_CHECK_MODULES([EET], [eet >= 1.7.0], [], [AC_MSG_ERROR([EET not found])]) 817PKG_CHECK_MODULES([EET], [eet >= 1.7.0], [], [AC_MSG_ERROR([EET not found])])
818AC_DEFINE([BUILD_FONT_LOADER_EET], [1], [EET Font Loader Support])
819requirement_evas="eet >= 1.7.0 ${requirement_evas}" 818requirement_evas="eet >= 1.7.0 ${requirement_evas}"
820 819
821##################################################################### 820#####################################################################
diff --git a/legacy/evas/src/bin/evas_cserve2_fonts.c b/legacy/evas/src/bin/evas_cserve2_fonts.c
index 759bec1f73..cd6adabf52 100644
--- a/legacy/evas/src/bin/evas_cserve2_fonts.c
+++ b/legacy/evas/src/bin/evas_cserve2_fonts.c
@@ -6,9 +6,7 @@
6#include <sys/time.h> 6#include <sys/time.h>
7#endif 7#endif
8 8
9#ifdef BUILD_FONT_LOADER_EET
10#include <Eet.h> 9#include <Eet.h>
11#endif
12 10
13#include <ft2build.h> 11#include <ft2build.h>
14#include FT_FREETYPE_H 12#include FT_FREETYPE_H
@@ -99,7 +97,6 @@ _font_slave_source_load(const char *file, const char *name)
99 return NULL; 97 return NULL;
100 } 98 }
101 } 99 }
102#ifdef BUILD_FONT_LOADER_EET
103 else 100 else
104 { 101 {
105 Eet_File *ef; 102 Eet_File *ef;
@@ -131,7 +128,6 @@ _font_slave_source_load(const char *file, const char *name)
131 return NULL; 128 return NULL;
132 } 129 }
133 } 130 }
134#endif
135 131
136 error = FT_Select_Charmap(fsi->face, ft_encoding_unicode); 132 error = FT_Select_Charmap(fsi->face, ft_encoding_unicode);
137 if (error) 133 if (error)
@@ -600,9 +596,7 @@ cserve2_font_init(void)
600 error = FT_Init_FreeType(&cserve2_ft_lib); 596 error = FT_Init_FreeType(&cserve2_ft_lib);
601 if (error) return; 597 if (error) return;
602 598
603#ifdef BUILD_FONT_LOADER_EET
604 eet_init(); 599 eet_init();
605#endif
606} 600}
607 601
608void 602void
@@ -619,9 +613,7 @@ cserve2_font_shutdown(void)
619 FT_Done_FreeType(cserve2_ft_lib); 613 FT_Done_FreeType(cserve2_ft_lib);
620 cserve2_ft_lib = 0; 614 cserve2_ft_lib = 0;
621 615
622#ifdef BUILD_FONT_LOADER_EET
623 eet_shutdown(); 616 eet_shutdown();
624#endif
625} 617}
626 618
627void 619void
diff --git a/legacy/evas/src/lib/canvas/evas_font_dir.c b/legacy/evas/src/lib/canvas/evas_font_dir.c
index e67668513b..5a19a08fba 100644
--- a/legacy/evas/src/lib/canvas/evas_font_dir.c
+++ b/legacy/evas/src/lib/canvas/evas_font_dir.c
@@ -6,9 +6,7 @@
6# include <Evil.h> 6# include <Evil.h>
7#endif 7#endif
8 8
9#ifdef BUILD_FONT_LOADER_EET
10#include <Eet.h> 9#include <Eet.h>
11#endif
12 10
13#ifdef HAVE_FONTCONFIG 11#ifdef HAVE_FONTCONFIG
14#include <fontconfig/fontconfig.h> 12#include <fontconfig/fontconfig.h>
@@ -593,7 +591,6 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
593 { 591 {
594 if (l == fonts || !font) /* First iteration OR no font */ 592 if (l == fonts || !font) /* First iteration OR no font */
595 { 593 {
596#ifdef BUILD_FONT_LOADER_EET
597 if (source) /* Load Font from "eet" source */ 594 if (source) /* Load Font from "eet" source */
598 { 595 {
599 Eet_File *ef; 596 Eet_File *ef;
@@ -626,7 +623,6 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
626 } 623 }
627 if (!font) /* Source load failed */ 624 if (!font) /* Source load failed */
628 { 625 {
629#endif
630 if (evas_file_path_is_full_path((char *)nm)) /* Try filename */ 626 if (evas_file_path_is_full_path((char *)nm)) /* Try filename */
631 font = evas->engine.func->font_load(evas->engine.data.output, (char *)nm, size, wanted_rend); 627 font = evas->engine.func->font_load(evas->engine.data.output, (char *)nm, size, wanted_rend);
632 else /* search font path */ 628 else /* search font path */
@@ -646,13 +642,10 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
646 } 642 }
647 } 643 }
648 } 644 }
649#ifdef BUILD_FONT_LOADER_EET
650 } 645 }
651#endif
652 } 646 }
653 else /* Base font loaded, append others */ 647 else /* Base font loaded, append others */
654 { 648 {
655#ifdef BUILD_FONT_LOADER_EET
656 void *ok = NULL; 649 void *ok = NULL;
657 650
658 if (source) 651 if (source)
@@ -689,7 +682,6 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
689 } 682 }
690 if (!ok) 683 if (!ok)
691 { 684 {
692#endif
693 if (evas_file_path_is_full_path((char *)nm)) 685 if (evas_file_path_is_full_path((char *)nm))
694 evas->engine.func->font_add(evas->engine.data.output, font, (char *)nm, size, wanted_rend); 686 evas->engine.func->font_add(evas->engine.data.output, font, (char *)nm, size, wanted_rend);
695 else 687 else
@@ -709,9 +701,7 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
709 } 701 }
710 } 702 }
711 } 703 }
712#ifdef BUILD_FONT_LOADER_EET
713 } 704 }
714#endif
715 } 705 }
716 eina_stringshare_del(nm); 706 eina_stringshare_del(nm);
717 } 707 }