summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2003-07-27 01:10:15 +0000
committerOwen Taylor <otaylor@src.gnome.org>2003-07-27 01:10:15 +0000
commitc40435ea4976a2d0b2a097e2982a0742bc0e996c (patch)
tree17cb112fc3a5c0ad7cdbc703a66789e35d5ccfad
parentb36cd6496c29664387ee38b5f957db954cda1977 (diff)
downloadpango-c40435ea4976a2d0b2a097e2982a0742bc0e996c.tar.gz
Fix confusion between boolean and FT_Error return. (GSUB equivalent of fix
Sat Jul 26 21:06:26 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgsub.c (Load_EmptyOrClassDefinition): Fix confusion between boolean and FT_Error return. (GSUB equivalent of fix for #108358)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--ChangeLog.pre-1-46
-rw-r--r--ChangeLog.pre-1-66
-rw-r--r--ChangeLog.pre-1-86
-rw-r--r--pango/opentype/ftxgsub.c5
6 files changed, 33 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c69be12d..40d9b750 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jul 26 21:06:26 2003 Owen Taylor <otaylor@redhat.com>
+
+ * pango/opentype/ftxgsub.c (Load_EmptyOrClassDefinition):
+ Fix confusion between boolean and FT_Error return.
+ (GSUB equivalent of fix for #108358)
+
Sat Jul 26 10:52:20 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxgpos.c (Lookup_ContextPos2):
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index c69be12d..40d9b750 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+Sat Jul 26 21:06:26 2003 Owen Taylor <otaylor@redhat.com>
+
+ * pango/opentype/ftxgsub.c (Load_EmptyOrClassDefinition):
+ Fix confusion between boolean and FT_Error return.
+ (GSUB equivalent of fix for #108358)
+
Sat Jul 26 10:52:20 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxgpos.c (Lookup_ContextPos2):
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index c69be12d..40d9b750 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,9 @@
+Sat Jul 26 21:06:26 2003 Owen Taylor <otaylor@redhat.com>
+
+ * pango/opentype/ftxgsub.c (Load_EmptyOrClassDefinition):
+ Fix confusion between boolean and FT_Error return.
+ (GSUB equivalent of fix for #108358)
+
Sat Jul 26 10:52:20 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxgpos.c (Lookup_ContextPos2):
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index c69be12d..40d9b750 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,9 @@
+Sat Jul 26 21:06:26 2003 Owen Taylor <otaylor@redhat.com>
+
+ * pango/opentype/ftxgsub.c (Load_EmptyOrClassDefinition):
+ Fix confusion between boolean and FT_Error return.
+ (GSUB equivalent of fix for #108358)
+
Sat Jul 26 10:52:20 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxgpos.c (Lookup_ContextPos2):
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index c69be12d..40d9b750 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,9 @@
+Sat Jul 26 21:06:26 2003 Owen Taylor <otaylor@redhat.com>
+
+ * pango/opentype/ftxgsub.c (Load_EmptyOrClassDefinition):
+ Fix confusion between boolean and FT_Error return.
+ (GSUB equivalent of fix for #108358)
+
Sat Jul 26 10:52:20 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxgpos.c (Lookup_ContextPos2):
diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c
index aedc551a..ff42dc6a 100644
--- a/pango/opentype/ftxgsub.c
+++ b/pango/opentype/ftxgsub.c
@@ -2969,12 +2969,13 @@
if ( class_offset )
{
if ( !FILE_Seek( class_offset + base_offset ) )
- error = Load_ClassDefinition( cd, limit, stream ) == TT_Err_Ok;
+ error = Load_ClassDefinition( cd, limit, stream );
}
else
error = Load_EmptyClassDefinition ( cd, stream );
- (void)FILE_Seek( cur_offset );
+ if (error == TT_Err_Ok)
+ (void)FILE_Seek( cur_offset ); /* Changes error as a side-effect */
return error;
}