summarylogtreecommitdiffstats
path: root/0004-Enable-old-engines-but-keep-adobe-as-default.patch
blob: 325d6b9227f673e1b0f6035734d94413f39e66dc (plain)
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 9482db09a09e2cb610f08a06e681d1a4b2356b36 Mon Sep 17 00:00:00 2001
Message-Id: <9482db09a09e2cb610f08a06e681d1a4b2356b36.1552648361.git.jan.steffens@gmail.com>
In-Reply-To: <b609203df7333beea20dbfd604262a9486f01497.1552648361.git.jan.steffens@gmail.com>
References: <b609203df7333beea20dbfd604262a9486f01497.1552648361.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 4ff4e7821..3a7ed8725 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -778,7 +778,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
 
 
   /*************************************************************************/
@@ -820,7 +820,7 @@ FT_BEGIN_HEADER
    * 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 1a1030c06..1a767ee26 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -1163,11 +1163,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 4e9728719..4747af185 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -479,11 +479,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 741388a64..5abcdbc22 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -599,11 +599,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.21.0