summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2005-08-03 21:21:11 +0000
committerWerner Lemberg <wl@gnu.org>2005-08-03 21:21:11 +0000
commit87c8e581a36e8f3427610176520692c7c77cb488 (patch)
tree1fee93223a0d5ee855be257c3194f802f0f3ba0b
parent9ee99bc9606af57fc6cc2e2ede5fdae6223ac633 (diff)
downloadfreetype2-87c8e581a36e8f3427610176520692c7c77cb488.tar.gz
* src/sfnt/sfdriver.c (sfnt_interface) [FT_OPTIMIZE_MEMORY]:
Reactivate pointers to tt_find_sbit_image and tt_load_sbit_metrics to make X work again.
-rw-r--r--ChangeLog6
-rw-r--r--src/sfnt/sfdriver.c9
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a49b7e7de..527dc1320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-03 Werner Lemberg <wl@gnu.org>
+
+ * src/sfnt/sfdriver.c (sfnt_interface) [FT_OPTIMIZE_MEMORY]:
+ Reactivate pointers to tt_find_sbit_image and tt_load_sbit_metrics
+ to make X work again.
+
2005-08-02 Werner Lemberg <wl@gnu.org>
* src/otvalid/otvcommn.h: Remove dead code.
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index 96a312dfa..a282681f8 100644
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -367,8 +367,13 @@
/* see `ttsbit.h' and `sfnt.h' */
tt_face_set_sbit_strike,
tt_face_load_sbit_strikes,
- 0 /* tt_find_sbit_image */,
- 0 /* tt_load_sbit_metrics */,
+#ifdef FT_OPTIMIZE_MEMORY
+ 0,
+ 0,
+#else
+ tt_find_sbit_image,
+ tt_load_sbit_metrics,
+#endif
tt_face_load_sbit_image,
tt_face_free_sbit_strikes,