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
1b1488fd
Commit
1b1488fd
authored
Apr 24, 2017
by
Nikolay Sivov
Committed by
Alexandre Julliard
Apr 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Look for 'SVG ' table too when checking supported formats.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f74e1b1f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
opentype.c
dlls/dwrite/opentype.c
+5
-1
font.c
dlls/dwrite/tests/font.c
+5
-1
No files found.
dlls/dwrite/opentype.c
View file @
1b1488fd
...
...
@@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite);
#define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f')
#define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ')
#define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R')
#define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ')
#ifdef WORDS_BIGENDIAN
#define GET_BE_WORD(x) (x)
...
...
@@ -2069,6 +2070,9 @@ UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4 *fontface)
if
(
opentype_has_font_table
(
fontface
,
MS_COLR_TAG
))
ret
|=
DWRITE_GLYPH_IMAGE_FORMATS_COLR
;
/* TODO: handle SVG and bitmap data */
if
(
opentype_has_font_table
(
fontface
,
MS_SVG__TAG
))
ret
|=
DWRITE_GLYPH_IMAGE_FORMATS_SVG
;
/* TODO: handle embedded bitmaps tables */
return
ret
;
}
dlls/dwrite/tests/font.c
View file @
1b1488fd
...
...
@@ -45,6 +45,7 @@
#define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f')
#define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ')
#define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R')
#define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ')
#ifdef WORDS_BIGENDIAN
#define GET_BE_WORD(x) (x)
...
...
@@ -7436,7 +7437,10 @@ static DWORD get_face_glyph_image_formats(IDWriteFontFace4 *fontface)
if
(
face_has_table
(
fontface
,
MS_COLR_TAG
))
ret
|=
DWRITE_GLYPH_IMAGE_FORMATS_COLR
;
/* TODO: handle SVG and bitmap data */
if
(
face_has_table
(
fontface
,
MS_SVG__TAG
))
ret
|=
DWRITE_GLYPH_IMAGE_FORMATS_SVG
;
/* TODO: handle embedded bitmaps tables */
return
ret
;
}
...
...
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