Commit 6bb34880e87235dc0f51d2bbf1c5f48cd7cd407e
2009-06-28T00:43:37
Thinko. * src/psaux/t1decode.c (t1operator_seac) [FT_CONFIG_OPTION_INCREMENTAL]: Test for existence of incremental interface.
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
diff --git a/ChangeLog b/ChangeLog
index 084fc69..6c62411 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2009-06-28 Werner Lemberg <wl@gnu.org>
+ Thinko.
+
+ * src/psaux/t1decode.c (t1operator_seac)
+ [FT_CONFIG_OPTION_INCREMENTAL]: Test for existence of incremental
+ interface.
+
+2009-06-28 Werner Lemberg <wl@gnu.org>
+
* devel/ftoption.h [FT_CONFIG_OPTION_INCREMENTAL]: Define.
2009-06-27 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index f4f51a5..fcd7d57 100644
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -194,6 +194,9 @@
#endif
FT_Vector left_bearing, advance;
+#ifdef FT_CONFIG_OPTION_INCREMENTAL
+ T1_Face face = (T1_Face)decoder->builder.face;
+#endif
/* seac weirdness */
adx += decoder->builder.left_bearing.x;
@@ -208,17 +211,18 @@
}
#ifdef FT_CONFIG_OPTION_INCREMENTAL
-
- /* the caller must handle the font encoding also */
- bchar_index = bchar;
- achar_index = achar;
-
-#else
-
- bchar_index = t1_lookup_glyph_by_stdcharcode( decoder, bchar );
- achar_index = t1_lookup_glyph_by_stdcharcode( decoder, achar );
-
+ if ( face->root.internal->incremental_interface )
+ {
+ /* the caller must handle the font encoding also */
+ bchar_index = bchar;
+ achar_index = achar;
+ }
+ else
#endif
+ {
+ bchar_index = t1_lookup_glyph_by_stdcharcode( decoder, bchar );
+ achar_index = t1_lookup_glyph_by_stdcharcode( decoder, achar );
+ }
if ( bchar_index < 0 || achar_index < 0 )
{