diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-05-16 13:41:18 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-05-16 14:57:01 +0200 |
| commit | 37d0fce16d44553ad0a2d82c701c10c5cabfd1d2 (patch) | |
| tree | af51c2662009b372a25d7a039df4f63abc6c59eb | |
| parent | b17ddfd50d9daf87b7128768419ff87634d6507c (diff) | |
cairo svp: More build fixes.
Change-Id: I9545488eca9bdae042fd7ee5b9b249456bd32fd1
| -rw-r--r-- | vcl/headless/svpgdi.cxx | 7 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index d9bd50462397..17133ff80a2d 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -725,6 +725,7 @@ bool SvpSalGraphics::drawPolyLine( eCairoLineJoin = CAIRO_LINE_JOIN_ROUND; break; case basegfx::B2DLINEJOIN_NONE: + case basegfx::B2DLINEJOIN_MIDDLE: case basegfx::B2DLINEJOIN_MITER: eCairoLineJoin = CAIRO_LINE_JOIN_MITER; break; @@ -1164,7 +1165,7 @@ void SvpSalGraphics::invert(const basegfx::B2DPolygon &rPoly, SalInvert nFlags) SAL_WARN("vcl.gdi", "SvpSalGraphics::invert, archaic cairo"); } - if (nFlags & SalInvert::TrackFrame) + if (nFlags & SAL_INVERT_TrackFrame) { cairo_set_line_width(cr, 2.0); const double dashLengths[2] = { 4.0, 4.0 }; @@ -1180,7 +1181,7 @@ void SvpSalGraphics::invert(const basegfx::B2DPolygon &rPoly, SalInvert nFlags) cairo_clip(cr); - if (nFlags & SalInvert::N50) + if (nFlags & SAL_INVERT_N50) { cairo_pattern_t *pattern = create_stipple(); cairo_mask(cr, pattern); @@ -1401,6 +1402,8 @@ bool SvpSalGraphics::supportsOperation(OutDevSupportType eType) const case OutDevSupport_TransparentRect: case OutDevSupport_B2DDraw: return true; + case OutDevSupport_B2DClip: //what's this one ? + return false; } return false; } diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 5cb77b052636..deaad22afd13 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -261,7 +261,7 @@ void CairoTextRender::DrawServerFontLayout( const ServerFontLayout& rLayout ) if (!font_face) { const ImplFontOptions *pOptions = rFont.GetFontOptions().get(); - void *pPattern = pOptions ? pOptions->GetPattern(aFace, aId.mbEmbolden) : nullptr; + void *pPattern = pOptions ? pOptions->GetPattern(aFace, aId.mbEmbolden, aId.mbVerticalMetrics) : nullptr; if (pPattern) font_face = cairo_ft_font_face_create_for_pattern(static_cast<FcPattern*>(pPattern)); if (!font_face) |