Attachment 109394 Details for Bug 84908 – A third proposal for solving the MSVC compilation issue

[patch] A third proposal for solving the MSVC compilation issue

Thomas_Berg_fix_for_path_stroke_traps_c.diff (text/plain), 1.35 KB, created by John Emmas on 2014-11-13 09:37:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Emmas

Created: 2014-11-13 09:37:57 UTC

Size: 1.35 KB

patch

obsolete

> src/cairo-path-stroke-traps.c |   16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
>diff --git a/src/cairo-path-stroke-traps.c b/src/cairo-path-stroke-traps.c
>index 520a3e5..98ff08a 100644
>--- a/src/cairo-path-stroke-traps.c
>+++ b/src/cairo-path-stroke-traps.c
>@@ -299,8 +299,10 @@ 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[3];
>+	    cairo_point_t e[4];
>+	    t[0] = in->point; t[1] = *inpt; t[2] = *outpt;
>+	    e[0] = in->cw; e[1] = in->ccw; e[2] = out->cw; e[3] = out->ccw;
> 	    _cairo_traps_tessellate_triangle_with_edges (stroker->traps, t, e);
> 	}
> 	break;
>@@ -461,10 +463,12 @@ 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_traps_tessellate_triangle_with_edges (stroker->traps, t, e);
>-	break;
>+    cairo_point_t t[3];
>+    cairo_point_t e[4];
>+    t[0] = in->point; t[1] = *inpt; t[2] = *outpt;
>+    e[0] = in->cw; e[1] = in->ccw; e[2] = out->cw; e[3] = out->ccw;
>+    _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.