Fix a couple of places where TTO_Err_Not_Covered wasn't considered a

Fri Jul 25 22:25:48 2003  Owen Taylor  <otaylor@redhat.com>

        * pango/opentype/ftxgsub.c (Lookup_ContextSubst2,
        Lookup_ChainContextSubst2): Fix a couple of
        places where TTO_Err_Not_Covered wasn't considered
        a successful return from Get_Class -- it means
        use class index 0. (From FreeType, Werner Lemberg,
        2001-08-06)

6 files changed, 107 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e8b0378d..09ce25a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Fri Jul 25 22:25:48 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/ftxgsub.c (Lookup_ContextSubst2,
+	Lookup_ChainContextSubst2): Fix a couple of
+	places where TTO_Err_Not_Covered wasn't considered
+	a successful return from Get_Class -- it means
+	use class index 0. (From FreeType, Werner Lemberg,
+	2001-08-06)
+
+Fri Jul 25 20:12:00 2003  Owen Taylor  <otaylor@redhat.com>
+
+	Improvements to OpenType-dumping code, based on
+	changes in Qt by Lars Knoll.
+
+	* pango/opentype/ottest.c: Tweak the debugging output,
+	suppress some warnings.
+
+	* pango/opentype/disasm.c: Add support for 
+	GSUB Context/Chain GPOS MarkBase lookups, improve 
+	output in various ways.
+
 Fri Jul 25 12:07:21 2003  Owen Taylor  <otaylor@redhat.com>
 
         * modules/indic/mprefixups.[ch] modules/indic/indic-ot.[ch]
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index e8b0378d..09ce25a4 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,24 @@
+Fri Jul 25 22:25:48 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/ftxgsub.c (Lookup_ContextSubst2,
+	Lookup_ChainContextSubst2): Fix a couple of
+	places where TTO_Err_Not_Covered wasn't considered
+	a successful return from Get_Class -- it means
+	use class index 0. (From FreeType, Werner Lemberg,
+	2001-08-06)
+
+Fri Jul 25 20:12:00 2003  Owen Taylor  <otaylor@redhat.com>
+
+	Improvements to OpenType-dumping code, based on
+	changes in Qt by Lars Knoll.
+
+	* pango/opentype/ottest.c: Tweak the debugging output,
+	suppress some warnings.
+
+	* pango/opentype/disasm.c: Add support for 
+	GSUB Context/Chain GPOS MarkBase lookups, improve 
+	output in various ways.
+
 Fri Jul 25 12:07:21 2003  Owen Taylor  <otaylor@redhat.com>
 
         * modules/indic/mprefixups.[ch] modules/indic/indic-ot.[ch]
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index e8b0378d..09ce25a4 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,24 @@
+Fri Jul 25 22:25:48 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/ftxgsub.c (Lookup_ContextSubst2,
+	Lookup_ChainContextSubst2): Fix a couple of
+	places where TTO_Err_Not_Covered wasn't considered
+	a successful return from Get_Class -- it means
+	use class index 0. (From FreeType, Werner Lemberg,
+	2001-08-06)
+
+Fri Jul 25 20:12:00 2003  Owen Taylor  <otaylor@redhat.com>
+
+	Improvements to OpenType-dumping code, based on
+	changes in Qt by Lars Knoll.
+
+	* pango/opentype/ottest.c: Tweak the debugging output,
+	suppress some warnings.
+
+	* pango/opentype/disasm.c: Add support for 
+	GSUB Context/Chain GPOS MarkBase lookups, improve 
+	output in various ways.
+
 Fri Jul 25 12:07:21 2003  Owen Taylor  <otaylor@redhat.com>
 
         * modules/indic/mprefixups.[ch] modules/indic/indic-ot.[ch]
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index e8b0378d..09ce25a4 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,24 @@
+Fri Jul 25 22:25:48 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/ftxgsub.c (Lookup_ContextSubst2,
+	Lookup_ChainContextSubst2): Fix a couple of
+	places where TTO_Err_Not_Covered wasn't considered
+	a successful return from Get_Class -- it means
+	use class index 0. (From FreeType, Werner Lemberg,
+	2001-08-06)
+
+Fri Jul 25 20:12:00 2003  Owen Taylor  <otaylor@redhat.com>
+
+	Improvements to OpenType-dumping code, based on
+	changes in Qt by Lars Knoll.
+
+	* pango/opentype/ottest.c: Tweak the debugging output,
+	suppress some warnings.
+
+	* pango/opentype/disasm.c: Add support for 
+	GSUB Context/Chain GPOS MarkBase lookups, improve 
+	output in various ways.
+
 Fri Jul 25 12:07:21 2003  Owen Taylor  <otaylor@redhat.com>
 
         * modules/indic/mprefixups.[ch] modules/indic/indic-ot.[ch]
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index e8b0378d..09ce25a4 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,24 @@
+Fri Jul 25 22:25:48 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/opentype/ftxgsub.c (Lookup_ContextSubst2,
+	Lookup_ChainContextSubst2): Fix a couple of
+	places where TTO_Err_Not_Covered wasn't considered
+	a successful return from Get_Class -- it means
+	use class index 0. (From FreeType, Werner Lemberg,
+	2001-08-06)
+
+Fri Jul 25 20:12:00 2003  Owen Taylor  <otaylor@redhat.com>
+
+	Improvements to OpenType-dumping code, based on
+	changes in Qt by Lars Knoll.
+
+	* pango/opentype/ottest.c: Tweak the debugging output,
+	suppress some warnings.
+
+	* pango/opentype/disasm.c: Add support for 
+	GSUB Context/Chain GPOS MarkBase lookups, improve 
+	output in various ways.
+
 Fri Jul 25 12:07:21 2003  Owen Taylor  <otaylor@redhat.com>
 
         * modules/indic/mprefixups.[ch] modules/indic/indic-ot.[ch]
diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c
index 837bfe10..148b3a6c 100644
--- a/pango/opentype/ftxgsub.c
+++ b/pango/opentype/ftxgsub.c
@@ -2197,7 +2197,7 @@
 
     error = Get_Class( &csf2->ClassDef, in->string[in->pos],
                        &classes[0], NULL );
-    if ( error )
+    if ( error && error != TTO_Err_Not_Covered )
       goto End;
     known_classes = 0;
 
@@ -3571,7 +3571,7 @@
 
     error = Get_Class( &ccsf2->InputClassDef, in->string[in->pos],
                        &input_classes[0], NULL );
-    if ( error )
+    if ( error && error != TTO_Err_Not_Covered )
       goto End1;
 
     cscs = &ccsf2->ChainSubClassSet[input_classes[0]];