Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fix for wxCairoRenderer with Cairo < 1.12

Browse Source 
cairo_surface_create_similar_image() introduced by the changes of
d6afb66388 is only available in 1.12 and later,
check for it being available and fall back to cairo_surface_create_similar()
with older versions.

This should fix Travis CI builds.
This commit is contained in:
Vadim Zeitlin
2016-03-28 17:51:16 +02:00
parent d8a90b4606
commit 7c4145490e
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/generic/graphicc.cpp
View File

@@ -2830,9 +2830,21 @@ wxCairoRenderer::CreateSubBitmap(const wxGraphicsBitmap& bitmap,
x + dstWidth <= srcWidth && y + dstHeight <= srcHeight, x + dstWidth <= srcWidth && y + dstHeight <= srcHeight,
wxNullGraphicsBitmap, wxS("Invalid bitmap region")); wxNullGraphicsBitmap, wxS("Invalid bitmap region"));
cairo_surface_t* dstSurface = cairo_surface_create_similar_image(srcSurface, cairo_surface_t* dstSurface;
cairo_image_surface_get_format(srcSurface), #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
dstWidth, dstHeight); if ( cairo_version() >= CAIRO_VERSION_ENCODE(1, 12, 0) )
{
dstSurface = cairo_surface_create_similar_image(srcSurface,
cairo_image_surface_get_format(srcSurface),
dstWidth, dstHeight);
}
else
#endif // Cairo 1.12
{
dstSurface = cairo_surface_create_similar(srcSurface,
CAIRO_CONTENT_COLOR_ALPHA,
dstWidth, dstHeight);
}
cairo_t* cr = cairo_create(dstSurface); cairo_t* cr = cairo_create(dstSurface);
cairo_set_source_surface(cr, srcSurface, -x, -y); cairo_set_source_surface(cr, srcSurface, -x, -y);