usp10: Simplify the "sr_2" assignments in GSUB_apply_ContextSubst().

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Aric Stewart <aric@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

usp10: Simplify the "sr_2" assignments in GSUB_apply_ContextSubst().
ebe75cb6 · Henri Verbeet · Alexandre Julliard · 6c13170b · ebe75cb6
Commit ebe75cb6 authored Apr 21, 2017 by Henri Verbeet Committed by Alexandre Julliard Apr 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

opentype.c dlls/usp10/opentype.c +2 -4

No files found.
--- a/dlls/usp10/opentype.c
+++ b/dlls/usp10/opentype.c
@@ -1121,8 +1121,7 @@ static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupT
                    }
                    TRACE("   Rule matches\n");
-                    sr_2 = (const GSUB_SubRule_2*)((const BYTE*)sr+
+                    sr_2 = (const GSUB_SubRule_2 *)&sr->Input[g_count - 1];
-                        FIELD_OFFSET(GSUB_SubRule_1, Input[g_count-1]));
                    for (l = 0; l < GET_BE_WORD(sr->SubstCount); l++)
                    {
@@ -1201,8 +1200,7 @@ static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupT
                    }
                    TRACE("   Rule matches\n");
-                    sr_2 = (const GSUB_SubClassRule_2*)((const BYTE*)sr+
+                    sr_2 = (const GSUB_SubClassRule_2 *)&sr->Class[g_count - 1];
-                        FIELD_OFFSET(GSUB_SubClassRule_1, Class[g_count-1]));
                    for (l = 0; l < GET_BE_WORD(sr->SubstCount); l++)
                    {