strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow capability to render text with no XRenderPictFormat

Browse source
This commit is contained in:
Caolán McNamara 2011-11-11 16:00:14 +00:00
parent 889b6a6e00
commit 75d3b1cbfd
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
vcl/unx/generic/gdi/salgdi3.cxx
View file

@ -84,6 +84,7 @@
#include <cairo.h>
#include <cairo-ft.h>
#include <cairo-xlib.h>
#include <cairo-xlib-xrender.h>
struct BOX
@ -321,14 +322,25 @@ void X11SalGraphics::DrawServerFontLayout( const ServerFontLayout& rLayout )
// find a XRenderPictFormat compatible with the Drawable
XRenderPictFormat* pVisualFormat = GetXRenderFormat();
DBG_ASSERT( pVisualFormat!=NULL, "no matching XRenderPictFormat for text" );
if( !pVisualFormat )
return;
Display* pDisplay = GetXDisplay();
cairo_surface_t *surface = cairo_xlib_surface_create_with_xrender_format (pDisplay,
hDrawable_, ScreenOfDisplay(pDisplay, m_nScreen), pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16);
cairo_surface_t *surface;
if (pVisualFormat)
{
surface = cairo_xlib_surface_create_with_xrender_format (pDisplay, hDrawable_,
ScreenOfDisplay(pDisplay, m_nScreen), pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16);
}
else
{
surface = cairo_xlib_surface_create(pDisplay, hDrawable_,
GetVisual().visual, SAL_MAX_INT16, SAL_MAX_INT16);
}
DBG_ASSERT( surface!=NULL, "no cairo surface for text" );
if( !surface )
return;
/*
* It might be ideal to cache surface and cairo context between calls and