1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
From 66a1ee9d22b77445051d64d008e7c7faced04a09 Mon Sep 17 00:00:00 2001
Message-Id: <66a1ee9d22b77445051d64d008e7c7faced04a09.1525322178.git.jan.steffens@gmail.com>
In-Reply-To: <56649dbc4d1c78fc2253e4b54f781f603f6eb332.1525322178.git.jan.steffens@gmail.com>
References: <56649dbc4d1c78fc2253e4b54f781f603f6eb332.1525322178.git.jan.steffens@gmail.com>
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sat, 16 Dec 2017 23:08:02 +0100
Subject: [PATCH 4/4] Enable old engines, but keep adobe as default
---
include/freetype/config/ftoption.h | 4 ++--
src/cff/cffobjs.c | 4 ----
src/cid/cidobjs.c | 4 ----
src/type1/t1objs.c | 4 ----
4 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 438d0614b..d04177197 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -750,7 +750,7 @@ FT_BEGIN_HEADER
/* switch between the two engines using the `hinting-engine' property of */
/* the type1 driver module. */
/* */
-/* #define T1_CONFIG_OPTION_OLD_ENGINE */
+#define T1_CONFIG_OPTION_OLD_ENGINE
/*************************************************************************/
@@ -793,7 +793,7 @@ FT_BEGIN_HEADER
/* switch between the two engines using the `hinting-engine' property of */
/* the cff driver module. */
/* */
-/* #define CFF_CONFIG_OPTION_OLD_ENGINE */
+#define CFF_CONFIG_OPTION_OLD_ENGINE
/*************************************************************************/
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index 61b736ca2..985766a77 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -1162,11 +1162,7 @@
/* set default property values, cf. `ftcffdrv.h' */
-#ifdef CFF_CONFIG_OPTION_OLD_ENGINE
- driver->hinting_engine = FT_HINTING_FREETYPE;
-#else
driver->hinting_engine = FT_HINTING_ADOBE;
-#endif
driver->no_stem_darkening = TRUE;
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
index 77afe1c87..e1ea64cd6 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -472,11 +472,7 @@
/* set default property values, cf. `ftt1drv.h' */
-#ifdef T1_CONFIG_OPTION_OLD_ENGINE
- driver->hinting_engine = FT_HINTING_FREETYPE;
-#else
driver->hinting_engine = FT_HINTING_ADOBE;
-#endif
driver->no_stem_darkening = TRUE;
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
index 7333c4c95..4cc27fe9e 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -587,11 +587,7 @@
/* set default property values, cf. `ftt1drv.h' */
-#ifdef T1_CONFIG_OPTION_OLD_ENGINE
- driver->hinting_engine = FT_HINTING_FREETYPE;
-#else
driver->hinting_engine = FT_HINTING_ADOBE;
-#endif
driver->no_stem_darkening = TRUE;
--
2.17.0
|