From fe6da50d04675baab18cd09359ba145e52b587c7 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Tue, 5 Jan 2010 10:10:15 +0100
Subject: [PATCH] Thinkos.

---
 src/psaux/t1decode.c   | 4 ++++
 src/truetype/ttgload.c | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index 29c3cae3a..2b535b090 100644
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -212,8 +212,12 @@
 
     /* `glyph_names' is set to 0 for CID fonts which do not */
     /* include an encoding.  How can we deal with these?    */
+#ifdef FT_CONFIG_OPTION_INCREMENTAL
     if ( decoder->glyph_names == 0                   &&
          !face->root.internal->incremental_interface )
+#else
+    if ( decoder->glyph_names == 0 )
+#endif /* FT_CONFIG_OPTION_INCREMENTAL */
     {
       FT_ERROR(( "t1operator_seac:"
                  " glyph names table not available in this font\n" ));
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index cd11c12b9..74fb73dea 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -1278,9 +1278,13 @@
 
     if ( loader->byte_len > 0 )
     {
+#ifdef FT_CONFIG_OPTION_INCREMENTAL
       /* for the incremental interface, `glyf_offset' is always zero */
       if ( !loader->glyf_offset                        &&
            !face->root.internal->incremental_interface )
+#else
+      if ( !loader->glyf_offset )
+#endif /* FT_CONFIG_OPTION_INCREMENTAL */
       {
         FT_TRACE2(( "no `glyf' table but non-zero `loca' entry\n" ));
         error = TT_Err_Invalid_Table;