summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-11-13 13:23:44 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-14 07:36:00 +0000
commit4faf8c24ecb1fd3cbc6c3a510bfa448c8cf6fc47 (patch)
tree7a6c437562baf741cea8a1010773ebe69614789a /vcl
parentcca9ca6290d2b1e1c909c12ee4818683e3808007 (diff)
InitRenderText only queries, and ret is unused
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/generic/gdi/gcach_xpeer.cxx21
-rw-r--r--vcl/unx/generic/gdi/gcach_xpeer.hxx2
-rw-r--r--vcl/unx/generic/gdi/xrender_peer.cxx32
-rw-r--r--vcl/unx/generic/gdi/xrender_peer.hxx2
4 files changed, 0 insertions, 57 deletions
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx
index 70279160aafc..318d34d61ec0 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx
@@ -75,8 +75,6 @@ X11GlyphPeer::X11GlyphPeer()
if( mnMaxScreens > 1 )
mnExtByteCount = sizeof(MultiScreenGlyph) + sizeof(Pixmap) * (mnMaxScreens - 1);
mnDefaultScreen = rSalDisplay.GetDefaultScreenNumber();
-
- InitAntialiasing();
}
// ---------------------------------------------------------------------------
@@ -103,25 +101,6 @@ X11GlyphPeer::~X11GlyphPeer()
}
}
-// ---------------------------------------------------------------------------
-
-void X11GlyphPeer::InitAntialiasing()
-{
- int nEnvAntiAlias = 0;
- const char* pEnvAntiAlias = getenv( "SAL_ANTIALIAS_DISABLE" );
- if( pEnvAntiAlias )
- {
- nEnvAntiAlias = atoi( pEnvAntiAlias );
- if( nEnvAntiAlias == 0 )
- return;
- }
-
- // enable XRENDER accelerated aliasing on screens that support it
- // unless it explicitly disabled by an environment variable
- if( (nEnvAntiAlias & 2) == 0 )
- XRenderPeer::GetInstance().InitRenderText();
-}
-
// ===========================================================================
enum { INFO_EMPTY=0, INFO_PIXMAP, INFO_XRENDER, INFO_RAWBMP, INFO_MULTISCREEN };
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.hxx b/vcl/unx/generic/gdi/gcach_xpeer.hxx
index 8b20eb614c9e..8618e83e75fc 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.hxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.hxx
@@ -49,8 +49,6 @@ public:
const RawBitmap* GetRawBitmap( ServerFont&, int nGlyphIndex );
protected:
- void InitAntialiasing();
-
virtual void RemovingFont( ServerFont& );
virtual void RemovingGlyph( ServerFont&, GlyphData&, int nGlyphIndex );
diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx
index 3b00dfae52af..b0e721ae5e85 100644
--- a/vcl/unx/generic/gdi/xrender_peer.cxx
+++ b/vcl/unx/generic/gdi/xrender_peer.cxx
@@ -74,36 +74,4 @@ void XRenderPeer::InitRenderLib()
mpStandardFormatA8 = FindPictureFormat( PictFormatAlphaMask|PictFormatDepth, aPictFormat );
}
-// ---------------------------------------------------------------------------
-
-// return mask of screens capable of XRENDER text
-sal_uInt32 XRenderPeer::InitRenderText()
-{
- if( !mpStandardFormatA8 )
- return 0;
-
- // and the visual must be supported too on at least one screen
- sal_uInt32 nRetMask = 0;
- SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay();
- const int nScreenCount = pSalDisp->GetScreenCount();
- XRenderPictFormat* pVisualFormat = NULL;
- int nMaxDepth = 0;
- for( int nScreen = 0; nScreen < nScreenCount; ++nScreen )
- {
- Visual* pXVisual = pSalDisp->GetVisual( nScreen ).GetVisual();
- pVisualFormat = FindVisualFormat( pXVisual );
- if( pVisualFormat != NULL )
- {
- int nVDepth = pSalDisp->GetVisual( nScreen ).GetDepth();
- if( nVDepth > nMaxDepth )
- nMaxDepth = nVDepth;
- nRetMask |= 1U << nScreen;
- }
- }
-
- return nRetMask;
-}
-
-// ---------------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx
index 2c095da6ab23..75b6e28c0191 100644
--- a/vcl/unx/generic/gdi/xrender_peer.hxx
+++ b/vcl/unx/generic/gdi/xrender_peer.hxx
@@ -42,8 +42,6 @@ class XRenderPeer
public:
static XRenderPeer& GetInstance();
- sal_uInt32 InitRenderText();
-
protected:
XRenderPeer();
void InitRenderLib();