Alexandre Julliard : winex11: Remove check for DIB color table in ExtTextOut.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1ff5f3d56fcc3d4d49c13139a88a9c13edc4ada4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1ff5f3d56fcc3d4d49c13139a8...

Author: Alexandre Julliard 
Date:   Mon Nov 14 21:25:47 2011 +0100

winex11: Remove check for DIB color table in ExtTextOut.

---

dlls/winex11.drv/xrender.c |   29 ++---------------------------
 1 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index 7ba61a3..e6fb9f0 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -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);