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
bbe66552
Commit
bbe66552
authored
Dec 15, 2014
by
Nikolay Sivov
Committed by
Alexandre Julliard
Dec 16, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Support outlines with oblique simulation.
parent
b4e26148
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
dwrite_private.h
dlls/dwrite/dwrite_private.h
+1
-1
font.c
dlls/dwrite/font.c
+1
-1
freetype.c
dlls/dwrite/freetype.c
+5
-5
No files found.
dlls/dwrite/dwrite_private.h
View file @
bbe66552
...
...
@@ -149,7 +149,7 @@ extern void release_freetype(void) DECLSPEC_HIDDEN;
extern
HRESULT
freetype_get_design_glyph_metrics
(
IDWriteFontFace2
*
,
UINT16
,
UINT16
,
DWRITE_GLYPH_METRICS
*
)
DECLSPEC_HIDDEN
;
extern
void
freetype_notify_cacheremove
(
IDWriteFontFace2
*
)
DECLSPEC_HIDDEN
;
extern
BOOL
freetype_is_monospaced
(
IDWriteFontFace2
*
)
DECLSPEC_HIDDEN
;
extern
HRESULT
freetype_get_glyph_outline
(
IDWriteFontFace2
*
,
FLOAT
,
UINT16
,
struct
glyph_outline
**
)
DECLSPEC_HIDDEN
;
extern
HRESULT
freetype_get_glyph_outline
(
IDWriteFontFace2
*
,
FLOAT
,
UINT16
,
USHORT
,
struct
glyph_outline
**
)
DECLSPEC_HIDDEN
;
/* Glyph shaping */
enum
SCRIPT_JUSTIFY
...
...
dlls/dwrite/font.c
View file @
bbe66552
...
...
@@ -515,7 +515,7 @@ static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace2 *iface,
/* FIXME: cache outlines */
hr
=
freetype_get_glyph_outline
(
iface
,
emSize
,
glyphs
[
g
],
&
outline
);
hr
=
freetype_get_glyph_outline
(
iface
,
emSize
,
glyphs
[
g
],
This
->
simulations
,
&
outline
);
if
(
FAILED
(
hr
))
return
hr
;
...
...
dlls/dwrite/freetype.c
View file @
bbe66552
...
...
@@ -339,7 +339,7 @@ static HRESULT get_outline_data(const FT_Outline *outline, struct glyph_outline
return
S_OK
;
}
HRESULT
freetype_get_glyph_outline
(
IDWriteFontFace2
*
fontface
,
FLOAT
emSize
,
UINT16
index
,
struct
glyph_outline
**
ret
)
HRESULT
freetype_get_glyph_outline
(
IDWriteFontFace2
*
fontface
,
FLOAT
emSize
,
UINT16
index
,
USHORT
simulations
,
struct
glyph_outline
**
ret
)
{
FTC_ScalerRec
scaler
;
HRESULT
hr
=
S_OK
;
...
...
@@ -358,10 +358,10 @@ HRESULT freetype_get_glyph_outline(IDWriteFontFace2 *fontface, FLOAT emSize, UIN
FT_Outline
*
outline
=
&
size
->
face
->
glyph
->
outline
;
FT_Matrix
m
;
m
.
xx
=
1
.
0
*
0x10000
;
m
.
xy
=
0
;
m
.
xx
=
1
<<
16
;
m
.
xy
=
simulations
&
DWRITE_FONT_SIMULATIONS_OBLIQUE
?
(
1
<<
16
)
/
3
:
0
;
m
.
yx
=
0
;
m
.
yy
=
-
1
.
0
*
0x10000
;
/* flip Y axis */
m
.
yy
=
-
(
1
<<
16
)
;
/* flip Y axis */
pFT_Outline_Transform
(
outline
,
&
m
);
...
...
@@ -400,7 +400,7 @@ BOOL freetype_is_monospaced(IDWriteFontFace2 *fontface)
return
FALSE
;
}
HRESULT
freetype_get_glyph_outline
(
IDWriteFontFace2
*
fontface
,
FLOAT
emSize
,
UINT16
index
,
struct
glyph_outline
**
ret
)
HRESULT
freetype_get_glyph_outline
(
IDWriteFontFace2
*
fontface
,
FLOAT
emSize
,
UINT16
index
,
USHORT
simulations
,
struct
glyph_outline
**
ret
)
{
*
ret
=
NULL
;
return
E_NOTIMPL
;
...
...
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