Skip to content

W
wine-winehq
Commit 232c16fa authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard
Browse files
Options

winex11.drv: Rename a local variable to avoid confusion with a global.

parent 8cedb218
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
dlls/winex11.drv/xrender.c
View file @ 232c16fa
...@@ -1076,7 +1076,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag ...@@ -1076,7 +1076,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
int textPixel, backgroundPixel; int textPixel, backgroundPixel;
HRGN saved_region = 0; HRGN saved_region = 0;
BOOL disable_antialias = FALSE; BOOL disable_antialias = FALSE;
AA_Type antialias = AA_None; AA_Type aa_type = AA_None;
DIBSECTION bmp; DIBSECTION bmp;
unsigned int idx; unsigned int idx;
double cosEsc, sinEsc; double cosEsc, sinEsc;
...@@ -1244,18 +1244,18 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag ...@@ -1244,18 +1244,18 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
EnterCriticalSection(&xrender_cs); EnterCriticalSection(&xrender_cs);
entry = glyphsetCache + physDev->xrender->cache_index; entry = glyphsetCache + physDev->xrender->cache_index;
if( disable_antialias == FALSE ) if( disable_antialias == FALSE )
antialias = entry->aa_default; aa_type = entry->aa_default;
formatEntry = entry->format[antialias]; formatEntry = entry->format[aa_type];
for(idx = 0; idx < count; idx++) { for(idx = 0; idx < count; idx++) {
if( !formatEntry ) { if( !formatEntry ) {
UploadGlyph(physDev, wstr[idx], antialias); UploadGlyph(physDev, wstr[idx], aa_type);
/* re-evaluate antialias since aa_default may have changed */ /* re-evaluate antialias since aa_default may have changed */
if( disable_antialias == FALSE ) if( disable_antialias == FALSE )
antialias = entry->aa_default; aa_type = entry->aa_default;
formatEntry = entry->format[antialias]; formatEntry = entry->format[aa_type];
} else if( wstr[idx] >= formatEntry->nrealized || formatEntry->realized[wstr[idx]] == FALSE) { } else if( wstr[idx] >= formatEntry->nrealized || formatEntry->realized[wstr[idx]] == FALSE) {
UploadGlyph(physDev, wstr[idx], antialias); UploadGlyph(physDev, wstr[idx], aa_type);
} }
} }
if (!formatEntry) if (!formatEntry)
...@@ -1299,7 +1299,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag ...@@ -1299,7 +1299,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
wine_tsx11_lock(); wine_tsx11_lock();
XSetForeground( gdi_display, physDev->gc, textPixel ); XSetForeground( gdi_display, physDev->gc, textPixel );
if(antialias == AA_None) { if(aa_type == AA_None) {
for(idx = 0; idx < count; idx++) { for(idx = 0; idx < count; idx++) {
SharpGlyphMono(physDev, physDev->dc_rect.left + x + xoff, SharpGlyphMono(physDev, physDev->dc_rect.left + x + xoff,
physDev->dc_rect.top + y + yoff, physDev->dc_rect.top + y + yoff,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment