Commit 733a21bdbc9516ccf47b9b20d3a39d069a4cdc82
2018-03-05T23:37:17
Make `ftlcdfil.c' part of the `base' module. `ftobjs.c' needs `ft_lcd_padding'. Problem reported by duhuanpeng <548708880@qq.com>. * modules.cfg (BASE_EXTENSIONS): Don't include `ftlcdfil.c'. * src/base/ftbase.c: Include `ftlcdfil.c'. * src/base/rules.mk (BASE_SRC): Add `ftlcdfil.c'. * src/base/Jamfile (_sources): Adjusted. * docs/INSTALL.ANY: Updated.
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 89 90 91 92 93 94 95 96 97 98
diff --git a/ChangeLog b/ChangeLog
index 17a658a..ee07320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
2018-03-05 Werner Lemberg <wl@gnu.org>
+ Make `ftlcdfil.c' part of the `base' module.
+
+ `ftobjs.c' needs `ft_lcd_padding'.
+
+ Problem reported by duhuanpeng <548708880@qq.com>.
+
+ * modules.cfg (BASE_EXTENSIONS): Don't include `ftlcdfil.c'.
+
+ * src/base/ftbase.c: Include `ftlcdfil.c'.
+ * src/base/rules.mk (BASE_SRC): Add `ftlcdfil.c'.
+ * src/base/Jamfile (_sources): Adjusted.
+
+ * docs/INSTALL.ANY: Updated.
+
+2018-03-05 Werner Lemberg <wl@gnu.org>
+
Make `ftfntfmt.c' part of the `base' module.
`ftobjs.c' needs `FT_Get_Font_Format'.
diff --git a/docs/INSTALL.ANY b/docs/INSTALL.ANY
index 618b634..fddac9a 100644
--- a/docs/INSTALL.ANY
+++ b/docs/INSTALL.ANY
@@ -42,7 +42,6 @@ I. Standard procedure
src/base/ftfstype.c -- optional
src/base/ftgasp.c -- optional, see <ftgasp.h>
src/base/ftgxval.c -- optional, see <ftgxval.h>
- src/base/ftlcdfil.c -- optional, see <ftlcdfil.h>
src/base/ftmm.c -- optional, see <ftmm.h>
src/base/ftotval.c -- optional, see <ftotval.h>
src/base/ftpatent.c -- optional
diff --git a/modules.cfg b/modules.cfg
index 25bf9ff..702cf99 100644
--- a/modules.cfg
+++ b/modules.cfg
@@ -203,11 +203,6 @@ BASE_EXTENSIONS += ftglyph.c
# See include/freetype/ftgxval.h for the API.
BASE_EXTENSIONS += ftgxval.c
-# Support for LCD color filtering of subpixel bitmaps.
-#
-# See include/freetype/ftlcdfil.h for the API.
-BASE_EXTENSIONS += ftlcdfil.c
-
# Multiple Master font interface.
#
# See include/freetype/ftmm.h for the API.
diff --git a/src/base/Jamfile b/src/base/Jamfile
index ec17033..4994c1b 100644
--- a/src/base/Jamfile
+++ b/src/base/Jamfile
@@ -24,6 +24,7 @@ SubDir FT2_TOP $(FT2_SRC_DIR) base ;
ftfntfmt
ftgloadr
fthash
+ ftlcdfil
ftobjs
ftoutln
ftpic
@@ -57,7 +58,6 @@ SubDir FT2_TOP $(FT2_SRC_DIR) base ;
ftglyph
ftgxval
ftinit
- ftlcdfil
ftmm
ftotval
ftpatent
diff --git a/src/base/ftbase.c b/src/base/ftbase.c
index 3e5bf22..f914b9b 100644
--- a/src/base/ftbase.c
+++ b/src/base/ftbase.c
@@ -26,6 +26,7 @@
#include "ftfntfmt.c"
#include "ftgloadr.c"
#include "fthash.c"
+#include "ftlcdfil.c"
#include "ftmac.c"
#include "ftobjs.c"
#include "ftoutln.c"
diff --git a/src/base/rules.mk b/src/base/rules.mk
index 0f47a72..e9805bd 100644
--- a/src/base/rules.mk
+++ b/src/base/rules.mk
@@ -43,6 +43,7 @@ BASE_SRC := $(BASE_DIR)/basepic.c \
$(BASE_DIR)/ftfntfmt.c \
$(BASE_DIR)/ftgloadr.c \
$(BASE_DIR)/fthash.c \
+ $(BASE_DIR)/ftlcdfil.c \
$(BASE_DIR)/ftobjs.c \
$(BASE_DIR)/ftoutln.c \
$(BASE_DIR)/ftpic.c \