ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dwrite: Fix array indexing when merging features. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2020-05-25 14:54:27 +03:00 committed by Alexandre Julliard
parent 2a2607e2a3
commit 4490f8a274
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/dwrite/shape.c
View File

@ -231,7 +231,7 @@ static int features_sorting_compare(const void *a, const void *b)
static void shape_merge_features(struct scriptshaping_context *context, struct shaping_features *features)
{
const DWRITE_TYPOGRAPHIC_FEATURES **user_features = context->user_features.features;
unsigned int j = 0, i;
unsigned int i, j;
/* For now only consider global, enabled user features. */
if (user_features && context->user_features.range_lengths)
@ -250,7 +250,7 @@ static void shape_merge_features(struct scriptshaping_context *context, struct s
/* Sort and merge duplicates. */
qsort(features->features, features->count, sizeof(*features->features), features_sorting_compare);
for (i = 1; i < features->count; ++i)
for (i = 1, j = 0; i < features->count; ++i)
{
if (features->features[i].tag != features->features[j].tag)
features->features[++j] = features->features[i];