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
1ff5f3d5
Commit
1ff5f3d5
authored
Nov 14, 2011
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11: Remove check for DIB color table in ExtTextOut.
parent
49cade4b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
27 deletions
+2
-27
xrender.c
dlls/winex11.drv/xrender.c
+2
-27
No files found.
dlls/winex11.drv/xrender.c
View file @
1ff5f3d5
...
...
@@ -1964,22 +1964,6 @@ static int XRenderErrorHandler(Display *dpy, XErrorEvent *event, void *arg)
return
1
;
}
/********************************************************************
* is_dib_with_colortable
*
* Return TRUE if physdev is backed by a dibsection with <= 8 bits per pixel
*/
static
inline
BOOL
is_dib_with_colortable
(
X11DRV_PDEVICE
*
physDev
)
{
DIBSECTION
dib
;
if
(
physDev
->
bitmap
&&
GetObjectW
(
physDev
->
bitmap
->
hbitmap
,
sizeof
(
dib
),
&
dib
)
==
sizeof
(
dib
)
&&
dib
.
dsBmih
.
biBitCount
<=
8
)
return
TRUE
;
return
FALSE
;
}
/***********************************************************************
* xrenderdrv_ExtTextOut
*/
...
...
@@ -1993,7 +1977,6 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
BOOL
retv
=
FALSE
;
int
textPixel
,
backgroundPixel
;
RGNDATA
*
saved_region
=
NULL
;
BOOL
disable_antialias
=
FALSE
;
AA_Type
aa_type
=
AA_None
;
unsigned
int
idx
;
Picture
tile_pict
=
0
;
...
...
@@ -2004,12 +1987,6 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
return
dev
->
funcs
->
pExtTextOut
(
dev
,
x
,
y
,
flags
,
lprect
,
wstr
,
count
,
lpDx
);
}
if
(
is_dib_with_colortable
(
physdev
->
x11dev
))
{
TRACE
(
"Disabling antialiasing
\n
"
);
disable_antialias
=
TRUE
;
}
xgcval
.
function
=
GXcopy
;
xgcval
.
background
=
physdev
->
x11dev
->
backgroundPixel
;
xgcval
.
fill_style
=
FillSolid
;
...
...
@@ -2051,16 +2028,14 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
EnterCriticalSection
(
&
xrender_cs
);
entry
=
glyphsetCache
+
physdev
->
cache_index
;
if
(
disable_antialias
==
FALSE
)
aa_type
=
entry
->
aa_default
;
aa_type
=
entry
->
aa_default
;
formatEntry
=
entry
->
format
[
aa_type
];
for
(
idx
=
0
;
idx
<
count
;
idx
++
)
{
if
(
!
formatEntry
)
{
UploadGlyph
(
physdev
,
wstr
[
idx
],
aa_type
);
/* re-evaluate antialias since aa_default may have changed */
if
(
disable_antialias
==
FALSE
)
aa_type
=
entry
->
aa_default
;
aa_type
=
entry
->
aa_default
;
formatEntry
=
entry
->
format
[
aa_type
];
}
else
if
(
wstr
[
idx
]
>=
formatEntry
->
nrealized
||
formatEntry
->
realized
[
wstr
[
idx
]]
==
FALSE
)
{
UploadGlyph
(
physdev
,
wstr
[
idx
],
aa_type
);
...
...
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