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

Apply workaround in creating wxGraphicContext from native DC only for Cairo < 1.15.12 (wxMSW).

Browse Source 
Cairo bug 96482 was fixed in 1.15.12 so the workaround needs to be applied
only for older Cairo versions.
This commit is contained in:
Artur Wieczorek
2018-07-28 12:15:10 +02:00
parent c948e1e15e
commit 3f18576dee
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/generic/graphicc.cpp
View File

@@ -2013,9 +2013,10 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC&
// bug 96482) so in this case we would need to pass non-transformed // bug 96482) so in this case we would need to pass non-transformed
// DC to Cairo and to apply original DC transformation to the Cairo // DC to Cairo and to apply original DC transformation to the Cairo
// context operations on our own. // context operations on our own.
// We believe this bug will be fixed in the next Cairo version. // Bug 96482 was fixed in Cairo 1.15.12 so this workaround needs
#if CAIRO_VERSION <= CAIRO_VERSION_ENCODE(1, 15, 2) // to be applied only for older Cairo versions.
if ( cairo_version() <= CAIRO_VERSION_ENCODE(1, 15, 2) ) #if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 15, 12)
if ( cairo_version() < CAIRO_VERSION_ENCODE(1, 15, 12) )
{ {
wxCoord orgX, orgY; wxCoord orgX, orgY;
dc.GetDeviceOrigin(&orgX, &orgY); dc.GetDeviceOrigin(&orgX, &orgY);
@@ -2028,7 +2029,7 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC&
adjustTransformFromDC = true; adjustTransformFromDC = true;
} }
} }
#endif // Cairo <= 1.15.2 #endif // Cairo < 1.15.12
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 15, 4) #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 15, 4)
if ( cairo_version() >= CAIRO_VERSION_ENCODE(1, 15, 4) ) if ( cairo_version() >= CAIRO_VERSION_ENCODE(1, 15, 4) )