From 56da7adc3c85be0325481ecd23746dc49e60d239 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Thu, 16 Oct 2014 20:51:07 +0200 Subject: [PATCH] win32: Fix compilation of 'cairo-path-stroke-traps.c' with MSVC8 "The issue here is that Visual Studio 2005+ is quite strict on type conversions (so it wants code to be clear enough on conversions)." Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=84908 --- src/cairo-path-stroke-traps.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/cairo-path-stroke-traps.c b/src/cairo-path-stroke-traps.c index 520a3e5b9..da54e5a35 100644 --- a/src/cairo-path-stroke-traps.c +++ b/src/cairo-path-stroke-traps.c @@ -299,8 +299,9 @@ join (struct stroker *stroker, _cairo_traps_tessellate_triangle_with_edges (stroker->traps, tri, edges); } else { - cairo_point_t t[] = { in->point, *inpt, *outpt }; - cairo_point_t e[] = { in->cw, in->ccw, out->cw, out->ccw }; + cairo_point_t t[] = { { in->point.x, in->point.y}, { inpt->x, inpt->y }, { outpt->x, outpt->y } }; + cairo_point_t e[] = { { in->cw.x, in->cw.y}, { in->ccw.x, in->ccw.y }, + { out->cw.x, out->cw.y}, { out->ccw.x, out->ccw.y } }; _cairo_traps_tessellate_triangle_with_edges (stroker->traps, t, e); } break; @@ -461,8 +462,9 @@ join (struct stroker *stroker, } case CAIRO_LINE_JOIN_BEVEL: { - cairo_point_t t[] = { in->point, *inpt, *outpt }; - cairo_point_t e[] = { in->cw, in->ccw, out->cw, out->ccw }; + cairo_point_t t[] = { { in->point.x, in->point.y }, { inpt->x, inpt->y }, { outpt->x, outpt->y } }; + cairo_point_t e[] = { { in->cw.x, in->cw.y }, { in->ccw.x, in->ccw.y }, + { out->cw.x, out->cw.y }, { out->ccw.x, out->ccw.y } }; _cairo_traps_tessellate_triangle_with_edges (stroker->traps, t, e); break; }