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
6b8c910b
Commit
6b8c910b
authored
Jan 18, 2013
by
Aric Stewart
Committed by
Alexandre Julliard
Jan 18, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
usp10: MarkToMark calculations may need to happen even if the offset is 0.
parent
f071d9b3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
opentype.c
dlls/usp10/opentype.c
+6
-4
No files found.
dlls/usp10/opentype.c
View file @
6b8c910b
...
...
@@ -1548,10 +1548,11 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A
}
}
static
VOID
GPOS_apply_MarkToMark
(
const
OT_LookupTable
*
look
,
const
SCRIPT_ANALYSIS
*
analysis
,
const
WORD
*
glyphs
,
INT
glyph_index
,
static
BOOL
GPOS_apply_MarkToMark
(
const
OT_LookupTable
*
look
,
const
SCRIPT_ANALYSIS
*
analysis
,
const
WORD
*
glyphs
,
INT
glyph_index
,
INT
glyph_count
,
INT
ppem
,
LPPOINT
pt
)
{
int
j
;
BOOL
rc
=
FALSE
;
int
write_dir
=
(
analysis
->
fRTL
&&
!
analysis
->
fLogicalOrder
)
?
-
1
:
1
;
TRACE
(
"MarkToMark Attachment Positioning Subtable
\n
"
);
...
...
@@ -1589,7 +1590,7 @@ static VOID GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALY
if
(
mark_index
>
GET_BE_WORD
(
ma
->
MarkCount
))
{
ERR
(
"Mark index exeeded mark count
\n
"
);
return
;
return
FALSE
;
}
mr
=
&
ma
->
MarkRecord
[
mark_index
];
mark_class
=
GET_BE_WORD
(
mr
->
Class
);
...
...
@@ -1607,12 +1608,14 @@ static VOID GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALY
pt
->
x
+=
mark2_pt
.
x
-
mark_pt
.
x
;
pt
->
y
+=
mark2_pt
.
y
-
mark_pt
.
y
;
TRACE
(
"Resulting cumulative offset is %i,%i design units
\n
"
,
pt
->
x
,
pt
->
y
);
rc
=
TRUE
;
}
}
}
else
FIXME
(
"Unhandled Mark To Mark Format %i
\n
"
,
GET_BE_WORD
(
mmpf1
->
PosFormat
));
}
return
rc
;
}
static
INT
GPOS_apply_ChainContextPos
(
LPOUTLINETEXTMETRICW
lpotm
,
LPLOGFONTW
lplogfont
,
const
SCRIPT_ANALYSIS
*
analysis
,
INT
*
piAdvance
,
...
...
@@ -1832,8 +1835,7 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c
double
devX
,
devY
;
POINT
desU
=
{
0
,
0
};
int
write_dir
=
(
analysis
->
fRTL
&&
!
analysis
->
fLogicalOrder
)
?
-
1
:
1
;
GPOS_apply_MarkToMark
(
look
,
analysis
,
glyphs
,
glyph_index
,
glyph_count
,
ppem
,
&
desU
);
if
(
desU
.
x
||
desU
.
y
)
if
(
GPOS_apply_MarkToMark
(
look
,
analysis
,
glyphs
,
glyph_index
,
glyph_count
,
ppem
,
&
desU
))
{
GPOS_convert_design_units_to_device
(
lpotm
,
lplogfont
,
desU
.
x
,
desU
.
y
,
&
devX
,
&
devY
);
if
(
analysis
->
fRTL
&&
analysis
->
fLogicalOrder
)
devX
*=
-
1
;
...
...
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