Module: wine Branch: master Commit: d489f1ddff5f651a6b46f693526babc807e157f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d489f1ddff5f651a6b46f6935...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Tue Feb 16 12:48:38 2021 +0300
dwrite: Pass features to stage functions.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dwrite/dwrite_private.h | 5 ++++- dlls/dwrite/opentype.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index fa82a8d4376..830c71f0abf 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -564,7 +564,10 @@ struct shaping_feature
#define MAX_SHAPING_STAGE 16
-typedef void (*stage_func)(struct scriptshaping_context *context); +struct shaping_features; + +typedef void (*stage_func)(struct scriptshaping_context *context, + const struct shaping_features *features);
struct shaping_stage { diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index afae1b69d07..125b7353031 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -6070,7 +6070,7 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, }
if (features->stages[j].func) - features->stages[j].func(context); + features->stages[j].func(context, features); }
/* For every glyph range of [<last>.isClusterStart, <next>.isClusterStart) set corresponding