Nikolay Sivov : dwrite/opentype: Correct flags field size for layout lookup structure.

Alexandre Julliard julliard at winehq.org
Mon May 2 16:02:08 CDT 2022


Module: wine
Branch: master
Commit: e71920d2f446fff60ccbb5ff1b5e220c6af791c1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e71920d2f446fff60ccbb5ff1b5e220c6af791c1

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon May  2 09:22:16 2022 +0300

dwrite/opentype: Correct flags field size for layout lookup structure.

Higher 16 bits are used for mark filtering set index.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dwrite/opentype.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c
index 7df0d207bc6..7df153e681d 100644
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -3619,10 +3619,10 @@ struct lookup
 {
     unsigned short index;
     unsigned short type;
-    unsigned short flags;
     unsigned short subtable_count;
 
     unsigned int mask;
+    unsigned int flags;
     unsigned int offset;
     unsigned int auto_zwnj : 1;
     unsigned int auto_zwj : 1;
@@ -4542,9 +4542,9 @@ static int __cdecl lookups_sorting_compare(const void *a, const void *b)
 static BOOL opentype_layout_init_lookup(const struct ot_gsubgpos_table *table, unsigned short lookup_index,
         const struct shaping_feature *feature, struct lookup *lookup)
 {
-    unsigned short subtable_count, lookup_type, flags, mark_filtering_set;
+    unsigned short subtable_count, lookup_type, mark_filtering_set;
     const struct ot_lookup_table *lookup_table;
-    unsigned int offset;
+    unsigned int offset, flags;
 
     if (!(offset = table_read_be_word(&table->table, table->lookup_list +
             FIELD_OFFSET(struct ot_lookup_list, lookup[lookup_index]))))




More information about the wine-cvs mailing list