Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
448e9ce6
Commit
448e9ce6
authored
Jul 24, 2017
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jul 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Use newer enum version to avoid type mismatch (Coverity).
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
4f96439e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
gdiinterop.c
dlls/dwrite/gdiinterop.c
+6
-6
No files found.
dlls/dwrite/gdiinterop.c
View file @
448e9ce6
...
...
@@ -312,11 +312,11 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac
{
struct
rendertarget
*
This
=
impl_from_IDWriteBitmapRenderTarget1
(
iface
);
IDWriteGlyphRunAnalysis
*
analysis
;
DWRITE_RENDERING_MODE
rendermode
;
DWRITE_RENDERING_MODE
1
rendermode
;
DWRITE_GRID_FIT_MODE
gridfitmode
;
DWRITE_TEXTURE_TYPE
texturetype
;
IDWriteFontFace2
*
fontface2
;
DWRITE_GLYPH_RUN
scaled_run
;
IDWriteFontFace3
*
fontface
;
RECT
target
,
bounds
;
HRESULT
hr
;
...
...
@@ -331,21 +331,21 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac
if
(
!
params
)
return
E_INVALIDARG
;
if
(
FAILED
(
hr
=
IDWriteFontFace_QueryInterface
(
run
->
fontFace
,
&
IID_IDWriteFontFace
2
,
(
void
**
)
&
fontface2
)))
{
if
(
FAILED
(
hr
=
IDWriteFontFace_QueryInterface
(
run
->
fontFace
,
&
IID_IDWriteFontFace
3
,
(
void
**
)
&
fontface
)))
{
WARN
(
"Failed to get IDWriteFontFace2 interface, hr %#x.
\n
"
,
hr
);
return
hr
;
}
hr
=
IDWriteFontFace
2_GetRecommendedRenderingMode
(
fontface2
,
run
->
fontEmSize
,
This
->
ppdip
*
96
.
0
f
,
hr
=
IDWriteFontFace
3_GetRecommendedRenderingMode
(
fontface
,
run
->
fontEmSize
,
This
->
ppdip
*
96
.
0
f
,
This
->
ppdip
*
96
.
0
f
,
NULL
/* FIXME */
,
run
->
isSideways
,
DWRITE_OUTLINE_THRESHOLD_ALIASED
,
measuring_mode
,
params
,
&
rendermode
,
&
gridfitmode
);
IDWriteFontFace
2_Release
(
fontface2
);
IDWriteFontFace
3_Release
(
fontface
);
if
(
FAILED
(
hr
))
return
hr
;
SetRect
(
&
target
,
0
,
0
,
This
->
size
.
cx
,
This
->
size
.
cy
);
if
(
rendermode
==
DWRITE_RENDERING_MODE_OUTLINE
)
{
if
(
rendermode
==
DWRITE_RENDERING_MODE
1
_OUTLINE
)
{
static
const
XFORM
identity
=
{
1
.
0
f
,
0
.
0
f
,
0
.
0
f
,
1
.
0
f
,
0
.
0
f
,
0
.
0
f
};
const
DWRITE_MATRIX
*
m
=
&
This
->
m
;
XFORM
xform
;
...
...
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