summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2005-09-09 18:00:06 +0000
committerWerner Lemberg <wl@gnu.org>2005-09-09 18:00:06 +0000
commit97d5972367eb8859eae7107a4db89809ef346cc8 (patch)
tree547b842f50d44e83cee139bb7910c143eefd6ffe
parentcce5301443c5cff9c73ca838e6ac441988764d17 (diff)
downloadfreetype2-97d5972367eb8859eae7107a4db89809ef346cc8.tar.gz
* src/sfnt/sfobjs.c (sfnt_load_face): Reactivate code to set
FT_FACE_FLAG_KERNING which has been commented out erroneously. * docs/CHANGES: Document it.
-rw-r--r--ChangeLog7
-rw-r--r--docs/CHANGES2
-rw-r--r--src/sfnt/sfobjs.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ac2fbe3cf..d76520c25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-09 Werner Lemberg <wl@gnu.org>
+
+ * src/sfnt/sfobjs.c (sfnt_load_face): Reactivate code to set
+ FT_FACE_FLAG_KERNING which has been commented out erroneously.
+
+ * docs/CHANGES: Document it.
+
2005-09-05 Werner Lemberg <wl@gnu.org>
Fixes for `make multi' and using C++ compiler.
diff --git a/docs/CHANGES b/docs/CHANGES
index abd29ccce..44978299f 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -4,6 +4,8 @@ LATEST CHANGES BETWEEN 2.2.0 and 2.1.10
- Vertical metrics for SFNT fonts were incorrect sometimes.
+ - The FT_HAS_KERNING macro always returned 0.
+
II. IMPORTANT CHANGES
- A new API `FT_TrueTypeGX_Validate' (in FT_GX_VALIDATE_H) has
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index e2d2a17c6..9e846624a 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -555,11 +555,9 @@
if ( face->vertical_info )
flags |= FT_FACE_FLAG_VERTICAL;
-#if 0
/* kerning available ? */
if ( TT_FACE_HAS_KERNING( face ) )
flags |= FT_FACE_FLAG_KERNING;
-#endif
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
/* Don't bother to load the tables unless somebody asks for them. */