diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-13 20:38:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-14 07:36:01 +0000 |
| commit | 5670184ea887276643f4921e456a242455cbdc32 (patch) | |
| tree | aa0bf488adf2d54bcb2923407d84d51a9a2131de /vcl/unx/generic | |
| parent | 74730d4ace1cf603575b052698e6de36b50e189b (diff) | |
no way to construct a MultiScreenGlyph now
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/gdi/gcach_xpeer.cxx | 36 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/gcach_xpeer.hxx | 1 |
2 files changed, 1 insertions, 36 deletions
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx index 6f9bd69ba7e5..09acf205dd59 100644 --- a/vcl/unx/generic/gdi/gcach_xpeer.cxx +++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx @@ -42,18 +42,6 @@ // =========================================================================== -// all glyph specific data needed by the XGlyphPeer is quite trivial -// with one exception: if multiple screens are involved and non-antialiased -// glyph rendering is active, then we need screen specific pixmaps -struct MultiScreenGlyph -{ - const RawBitmap* mpRawBitmap; - Glyph maXRGlyphId; - Pixmap maPixmaps[1]; // [mnMaxScreens] -}; - -// =========================================================================== - X11GlyphPeer::X11GlyphPeer() : mpDisplay( GetGenericData()->GetSalDisplay()->GetDisplay() ) , mnMaxScreens(0) @@ -96,7 +84,7 @@ X11GlyphPeer::~X11GlyphPeer() // =========================================================================== -enum { INFO_EMPTY=0, INFO_PIXMAP, INFO_XRENDER, INFO_RAWBMP, INFO_MULTISCREEN }; +enum { INFO_EMPTY=0, INFO_PIXMAP, INFO_XRENDER, INFO_RAWBMP }; static const Glyph NO_GLYPHID = 0; static RawBitmap* const NO_RAWBMP = NULL; static const Pixmap NO_PIXMAP = ~0; @@ -112,9 +100,6 @@ void X11GlyphPeer::RemovingFont( ServerFont& rServerFont ) case INFO_RAWBMP: // nothing to do break; - case INFO_MULTISCREEN: - // cannot happen... - break; case INFO_XRENDER: XRenderPeer::GetInstance().FreeGlyphSet( (GlyphSet)pFontExt ); @@ -151,25 +136,6 @@ void X11GlyphPeer::RemovingGlyph( ServerFont& /*rServerFont*/, GlyphData& rGlyph } break; - case INFO_MULTISCREEN: - { - MultiScreenGlyph* pMSGlyph = reinterpret_cast<MultiScreenGlyph*>(pGlyphExt); - for( int i = 0; i < mnMaxScreens; ++i) - { - if( pMSGlyph->maPixmaps[i] == NO_PIXMAP ) - continue; - if( pMSGlyph->maPixmaps[i] == None ) - continue; - XFreePixmap( mpDisplay, pMSGlyph->maPixmaps[i] ); - mnBytesUsed -= nHeight * ((nWidth + 7) >> 3); - } - delete pMSGlyph->mpRawBitmap; - // Glyph nGlyphId = (Glyph)rGlyphData.GetExtPointer(); - // XRenderPeer::GetInstance().FreeGlyph( aGlyphSet, &nGlyphId ); - delete[] pMSGlyph; // it was allocated with new char[] - } - break; - case INFO_RAWBMP: { RawBitmap* pRawBitmap = (RawBitmap*)pGlyphExt; diff --git a/vcl/unx/generic/gdi/gcach_xpeer.hxx b/vcl/unx/generic/gdi/gcach_xpeer.hxx index 2418356a8aad..42032d42b351 100644 --- a/vcl/unx/generic/gdi/gcach_xpeer.hxx +++ b/vcl/unx/generic/gdi/gcach_xpeer.hxx @@ -36,7 +36,6 @@ #include "generic/glyphcache.hxx" class SalDisplay; -struct MultiScreenGlyph; class X11GlyphPeer : public GlyphCachePeer |