From 3d482e266febcf7da75f5662e518380460068ce1 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 24 Jun 2012 11:50:26 +0100 Subject: [PATCH] test: Exercise bug in joining together spline segments around cusps Carl Worth demonstrated a glaring bug in the new stroking code, introduced in commit 545f30856aac98199 (stroke: Convert the outlines into contour and then into a polygon), whereby only a bevel join was being used to connect segments around a sharp inflection point. This adds the two examples he reported to the test suite. --- test/Makefile.sources | 1 + test/bug-spline.c | 96 ++++++++++++++++++++++++++++++ test/reference/bug-spline.ref.png | Bin 0 -> 5476 bytes 3 files changed, 97 insertions(+) create mode 100644 test/bug-spline.c create mode 100644 test/reference/bug-spline.ref.png diff --git a/test/Makefile.sources b/test/Makefile.sources index ddb41b5ce..9aada620c 100644 --- a/test/Makefile.sources +++ b/test/Makefile.sources @@ -21,6 +21,7 @@ test_sources = \ big-empty-triangle.c \ big-little-box.c \ big-little-triangle.c \ + bug-spline.c \ big-trap.c \ bilevel-image.c \ bug-40410.c \ diff --git a/test/bug-spline.c b/test/bug-spline.c new file mode 100644 index 000000000..00a915cd3 --- /dev/null +++ b/test/bug-spline.c @@ -0,0 +1,96 @@ +/* cc `pkg-config --cflags --libs cairo` cairo-spline-image.c -o cairo-spline-image */ + +/* Copyright © 2005 Carl Worth + * Copyright © 2012 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include "cairo-test.h" + +#define WIDE_LINE_WIDTH 160 +#define NARROW_LINE_WIDTH 2 + +/* A spline showing bugs in the "contour-based stroking" in cairo 1.12 */ +static const struct spline { + struct { double x, y; } pt[5]; + double line_width; + double rgba[4]; +} splines[] = { + { + { + { 172.25, 156.185 }, + { 177.225, 164.06 }, + { 176.5, 157.5 }, + { 175.5, 159.5 }, + }, + WIDE_LINE_WIDTH, + { 1, 1, 1, 1 }, + }, + { + { + { 571.25, 247.185 }, + { 78.225, 224.06 }, + { 129.5, 312.5 }, + { 210.5, 224.5 }, + }, + NARROW_LINE_WIDTH, + { 1, 0, 0, 1 }, + } +}; +#define NUM_SPLINES (sizeof(splines)/sizeof(splines[0])) + +static cairo_test_status_t +draw (cairo_t *cr, int width, int height) +{ + unsigned n; + + cairo_set_source_rgb (cr, 0, 0, 0); + cairo_paint (cr); + + cairo_set_line_cap(cr, CAIRO_LINE_CAP_SQUARE); + + for (n = 0; n < NUM_SPLINES; n++) { + cairo_set_line_width (cr, splines[n].line_width); + cairo_set_source_rgba (cr, + splines[n].rgba[0], + splines[n].rgba[1], + splines[n].rgba[2], + splines[n].rgba[3]); + + cairo_move_to (cr, splines[n].pt[0].x, splines[n].pt[0].y); + cairo_curve_to (cr, + splines[n].pt[1].x, splines[n].pt[1].y, + splines[n].pt[2].x, splines[n].pt[2].y, + splines[n].pt[3].x, splines[n].pt[3].y); + + cairo_stroke (cr); + } + + return CAIRO_TEST_SUCCESS; +} + +CAIRO_TEST (bug_spline, + "Exercises a bug in the stroking of splines", + "spline, stroke", /* keywords */ + NULL, /* requirements */ + 300, 300, + NULL, draw) diff --git a/test/reference/bug-spline.ref.png b/test/reference/bug-spline.ref.png new file mode 100644 index 0000000000000000000000000000000000000000..ebef26144a827e3630b2b6c1baec1213d8a77f01 GIT binary patch literal 5476 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