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
d3b6b437
Commit
d3b6b437
authored
Nov 02, 2015
by
Nikolay Sivov
Committed by
Alexandre Julliard
Nov 03, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: When assembling run bitmap combine instead of overwriting.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
69da3a24
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
font.c
dlls/dwrite/font.c
+5
-3
No files found.
dlls/dwrite/font.c
View file @
d3b6b437
...
@@ -4269,7 +4269,8 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW
...
@@ -4269,7 +4269,8 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW
if
(
type
==
DWRITE_TEXTURE_CLEARTYPE_3x1
)
{
if
(
type
==
DWRITE_TEXTURE_CLEARTYPE_3x1
)
{
for
(
y
=
0
;
y
<
height
;
y
++
)
{
for
(
y
=
0
;
y
<
height
;
y
++
)
{
for
(
x
=
0
;
x
<
width
;
x
++
)
for
(
x
=
0
;
x
<
width
;
x
++
)
dst
[
3
*
x
]
=
dst
[
3
*
x
+
1
]
=
dst
[
3
*
x
+
2
]
=
(
src
[
x
/
8
]
&
masks
[
x
%
8
])
?
DWRITE_ALPHA_MAX
:
0
;
if
(
src
[
x
/
8
]
&
masks
[
x
%
8
])
dst
[
3
*
x
]
=
dst
[
3
*
x
+
1
]
=
dst
[
3
*
x
+
2
]
=
DWRITE_ALPHA_MAX
;
src
+=
glyph_bitmap
.
pitch
;
src
+=
glyph_bitmap
.
pitch
;
dst
+=
(
analysis
->
bounds
.
right
-
analysis
->
bounds
.
left
)
*
3
;
dst
+=
(
analysis
->
bounds
.
right
-
analysis
->
bounds
.
left
)
*
3
;
}
}
...
@@ -4277,7 +4278,8 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW
...
@@ -4277,7 +4278,8 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW
else
{
else
{
for
(
y
=
0
;
y
<
height
;
y
++
)
{
for
(
y
=
0
;
y
<
height
;
y
++
)
{
for
(
x
=
0
;
x
<
width
;
x
++
)
for
(
x
=
0
;
x
<
width
;
x
++
)
dst
[
x
]
=
(
src
[
x
/
8
]
&
masks
[
x
%
8
])
?
DWRITE_ALPHA_MAX
:
0
;
if
(
src
[
x
/
8
]
&
masks
[
x
%
8
])
dst
[
x
]
=
DWRITE_ALPHA_MAX
;
src
+=
get_dib_stride
(
width
,
1
);
src
+=
get_dib_stride
(
width
,
1
);
dst
+=
analysis
->
bounds
.
right
-
analysis
->
bounds
.
left
;
dst
+=
analysis
->
bounds
.
right
-
analysis
->
bounds
.
left
;
}
}
...
@@ -4287,7 +4289,7 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW
...
@@ -4287,7 +4289,7 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW
/* at this point it's DWRITE_TEXTURE_CLEARTYPE_3x1 with 8bpp src bitmap */
/* at this point it's DWRITE_TEXTURE_CLEARTYPE_3x1 with 8bpp src bitmap */
for
(
y
=
0
;
y
<
height
;
y
++
)
{
for
(
y
=
0
;
y
<
height
;
y
++
)
{
for
(
x
=
0
;
x
<
width
;
x
++
)
for
(
x
=
0
;
x
<
width
;
x
++
)
dst
[
3
*
x
]
=
dst
[
3
*
x
+
1
]
=
dst
[
3
*
x
+
2
]
=
src
[
x
];
dst
[
3
*
x
]
=
dst
[
3
*
x
+
1
]
=
dst
[
3
*
x
+
2
]
=
src
[
x
]
|
dst
[
3
*
x
]
;
src
+=
glyph_bitmap
.
pitch
;
src
+=
glyph_bitmap
.
pitch
;
dst
+=
(
analysis
->
bounds
.
right
-
analysis
->
bounds
.
left
)
*
3
;
dst
+=
(
analysis
->
bounds
.
right
-
analysis
->
bounds
.
left
)
*
3
;
}
}
...
...
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