Attachment 107945 Details for Bug 84908 – Another variant to solve the msvc compilation problem

[patch] Another variant to solve the msvc compilation problem

bug-84908-2014-10-16-hb.diff (text/plain), 1.56 KB, created by Hans Breuer on 2014-10-16 19:15:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans Breuer

Created: 2014-10-16 19:15:27 UTC

Size: 1.56 KB

patch

obsolete

>From 00c79e80d05cb50e73672229fbc1170d7033c00d Mon Sep 17 00:00:00 2001
>From: Hans Breuer <hans@breuer.org>
>Date: Thu, 16 Oct 2014 20:51:07 +0200
>Subject: [PATCH] Bug 84908 - Fix compilation problem with msvc
>
>the closest version I found to work similar to what was there before
>
>diff --git a/src/cairo-path-stroke-traps.c b/src/cairo-path-stroke-traps.c
>index 520a3e5..da54e5a 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;
>     }

Actions: View | Splinter Review

Attachments on bug 84908: 107945 | 109394

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.