Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
5625a8e5
Commit
5625a8e5
authored
May 26, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
May 26, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Only enable single substitution lookups for chained substitution.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e5c6a7be
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
opentype.c
dlls/dwrite/opentype.c
+7
-4
No files found.
dlls/dwrite/opentype.c
View file @
5625a8e5
...
...
@@ -4550,7 +4550,7 @@ static BOOL opentype_layout_context_match_lookahead(struct glyph_iterator *iter,
}
static
void
opentype_layout_apply_gsub_lookup
(
struct
scriptshaping_context
*
context
,
unsigned
int
first_glyph
,
unsigned
int
glyph_count
,
int
lookup_index
);
unsigned
int
glyph_count
,
int
lookup_index
,
BOOL
only_single
);
static
BOOL
opentype_layout_context_gsub_apply_lookup
(
struct
glyph_iterator
*
iter
,
unsigned
int
count
,
unsigned
int
lookup_count
,
const
UINT16
*
lookup_records
)
...
...
@@ -4559,7 +4559,7 @@ static BOOL opentype_layout_context_gsub_apply_lookup(struct glyph_iterator *ite
FIXME
(
"Only first lookup used.
\n
"
);
opentype_layout_apply_gsub_lookup
(
iter
->
context
,
iter
->
pos
+
GET_BE_WORD
(
lookup_records
[
0
]),
count
,
GET_BE_WORD
(
lookup_records
[
1
]));
GET_BE_WORD
(
lookup_records
[
1
])
,
TRUE
);
return
TRUE
;
}
...
...
@@ -4661,7 +4661,7 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct glyph_i
}
static
void
opentype_layout_apply_gsub_lookup
(
struct
scriptshaping_context
*
context
,
unsigned
int
first_glyph
,
unsigned
int
glyph_count
,
int
lookup_index
)
unsigned
int
glyph_count
,
int
lookup_index
,
BOOL
only_single
)
{
struct
ot_gsubgpos_table
*
table
=
&
context
->
cache
->
gsub
;
const
struct
ot_lookup_table
*
lookup_table
;
...
...
@@ -4685,6 +4685,9 @@ static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont
lookup_type
=
GET_BE_WORD
(
lookup_table
->
lookup_type
);
lookup
.
flags
=
GET_BE_WORD
(
lookup_table
->
flags
);
if
(
lookup_type
!=
GSUB_LOOKUP_SINGLE_SUBST
&&
only_single
)
return
;
glyph_iterator_init
(
context
,
lookup
.
flags
,
first_glyph
,
glyph_count
,
&
iter
);
while
(
iter
.
pos
<
first_glyph
+
iter
.
len
)
...
...
@@ -4798,7 +4801,7 @@ HRESULT opentype_layout_apply_gsub_features(struct scriptshaping_context *contex
opentype_layout_set_glyph_masks
(
context
,
features
);
for
(
i
=
0
;
i
<
lookups
.
count
;
++
i
)
opentype_layout_apply_gsub_lookup
(
context
,
0
,
context
->
glyph_count
,
lookups
.
lookups
[
i
].
index
);
opentype_layout_apply_gsub_lookup
(
context
,
0
,
context
->
glyph_count
,
lookups
.
lookups
[
i
].
index
,
FALSE
);
heap_free
(
lookups
.
lookups
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment