diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-11-13 11:38:10 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-14 07:36:00 +0000 |
commit | f2adfadfa850510e87df7f200ef79e84fdb65f39 (patch) | |
tree | 488f5b27040720f7280ce7ed456c94d30102189a /vcl/unx | |
parent | c3ee916c2936d559d8027780f70d57663d8aa511 (diff) |
mnForcedAA no longer connected to anything, skip setting it
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/gdi/gcach_xpeer.cxx | 28 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/gcach_xpeer.hxx | 1 |
2 files changed, 0 insertions, 29 deletions
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx index ebcecdae73da..6c49db96976b 100644 --- a/vcl/unx/generic/gdi/gcach_xpeer.cxx +++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx @@ -59,7 +59,6 @@ X11GlyphPeer::X11GlyphPeer() , mnMaxScreens(0) , mnDefaultScreen(0) , mnExtByteCount(0) -, mnForcedAA(0) , mnUsingXRender(0) { maRawBitmap.mnAllocated = 0; @@ -119,38 +118,11 @@ void X11GlyphPeer::InitAntialiasing() } mnUsingXRender = 0; - mnForcedAA = 0; // enable XRENDER accelerated aliasing on screens that support it // unless it explicitly disabled by an environment variable if( (nEnvAntiAlias & 2) == 0 ) mnUsingXRender = XRenderPeer::GetInstance().InitRenderText(); - - // else enable client side antialiasing for these screens - // unless it is explicitly disabled by an environment variable - if( (nEnvAntiAlias & 1) != 0 ) - return; - - // enable client side antialiasing for screen visuals that are suitable - // mnForcedAA is a bitmask of screens enabled for client side antialiasing - mnForcedAA = (~(~0U << mnMaxScreens)) ^ mnUsingXRender; - SalDisplay& rSalDisplay = *GetGenericData()->GetSalDisplay(); - for( int nScreen = 0; nScreen < mnMaxScreens; ++nScreen) - { - Visual* pVisual = rSalDisplay.GetVisual( nScreen ).GetVisual(); - XVisualInfo aXVisualInfo; - aXVisualInfo.visualid = pVisual->visualid; - int nVisuals = 0; - XVisualInfo* pXVisualInfo = XGetVisualInfo( mpDisplay, VisualIDMask, &aXVisualInfo, &nVisuals ); - for( int i = nVisuals; --i >= 0; ) - { - if( ((pXVisualInfo[i].c_class==PseudoColor) || (pXVisualInfo[i].depth<24)) - && ((pXVisualInfo[i].c_class>GrayScale) || (pXVisualInfo[i].depth!=8) ) ) - mnForcedAA &= ~(1U << nScreen); - } - if( pXVisualInfo != NULL ) - XFree( pXVisualInfo ); - } } // =========================================================================== diff --git a/vcl/unx/generic/gdi/gcach_xpeer.hxx b/vcl/unx/generic/gdi/gcach_xpeer.hxx index 0de3d1ee1129..c3e3bb9918ca 100644 --- a/vcl/unx/generic/gdi/gcach_xpeer.hxx +++ b/vcl/unx/generic/gdi/gcach_xpeer.hxx @@ -69,7 +69,6 @@ private: int mnDefaultScreen; int mnExtByteCount; RawBitmap maRawBitmap; - sal_uInt32 mnForcedAA; sal_uInt32 mnUsingXRender; }; |