From b1a76394655793fd698a1281b00a3d049f9e70f5 Mon Sep 17 00:00:00 2001 From: Andrea Canciani Date: Tue, 10 Nov 2009 13:09:50 +0100 Subject: [PATCH] Add dash-offset test Stroking a dash pattern of odd length with a negative offset is broken (except when the pattern is composed by a single dash). --- test/Makefile.am | 1 + test/Makefile.sources | 1 + test/dash-offset.c | 95 +++++++++++++++++++++++++++++++++++++++ test/dash-offset.ref.png | Bin 0 -> 794 bytes 4 files changed, 97 insertions(+) create mode 100644 test/dash-offset.c create mode 100644 test/dash-offset.ref.png diff --git a/test/Makefile.am b/test/Makefile.am index af91f71b6..0e0593bbe 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -312,6 +312,7 @@ REFERENCE_IMAGES = \ dash-curve.xlib.ref.png \ dash-infinite-loop.ref.png \ dash-no-dash.ref.png \ + dash-offset.ref.png \ dash-offset-negative.ref.png \ dash-scale.ps2.argb32.ref.png \ dash-scale.ps2.rgb24.ref.png \ diff --git a/test/Makefile.sources b/test/Makefile.sources index 7c05dcaf9..8dff25a83 100644 --- a/test/Makefile.sources +++ b/test/Makefile.sources @@ -48,6 +48,7 @@ test_sources = \ dash-curve.c \ dash-infinite-loop.c \ dash-no-dash.c \ + dash-offset.c \ dash-offset-negative.c \ dash-scale.c \ dash-state.c \ diff --git a/test/dash-offset.c b/test/dash-offset.c new file mode 100644 index 000000000..9fa29a62d --- /dev/null +++ b/test/dash-offset.c @@ -0,0 +1,95 @@ +/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */ +/* cairo - a vector graphics library with display and print output + * + * Copyright 2009 Andrea Canciani + * + * This library is free software; you can redistribute it and/or + * modify it either under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation + * (the "LGPL") or, at your option, under the terms of the Mozilla + * Public License Version 1.1 (the "MPL"). If you do not alter this + * notice, a recipient may use your version of this file under either + * the MPL or the LGPL. + * + * You should have received a copy of the LGPL along with this library + * in the file COPYING-LGPL-2.1; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the MPL along with this library + * in the file COPYING-MPL-1.1 + * + * The contents of this file are subject to the Mozilla Public License + * Version 1.1 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY + * OF ANY KIND, either express or implied. See the LGPL or the MPL for + * the specific language governing rights and limitations. + * + * The Original Code is the cairo graphics library. + * + * The Initial Developer of the Original Code is University of Southern + * California. + * + * Contributor(s): + * Andrea Canciani + */ + +#include "cairo-test.h" + +#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) + +/* Lengths of the dashes of the dash patterns */ +static const double dashes[] = { 2, 2, 4, 4 }; +/* Dash offset in userspace units + * They always grow by 2, so the dash pattern is + * should be shifted by the same amount each time */ +static const double frac_offset[] = { 0, 2, 4, 6 }; +/* Dash offset relative to the whole dash pattern + * This corresponds to the non-inverted part only if + * the dash pattern has odd length, so the expected result + * is the same for every int_offset if the pattern has + * even lenght, and inverted each time (or shifted by half + * period, which is the same) if the pattern has odd length. */ +static const double int_offset[] = { -2, -1, 0, 1, 2 }; + +#define PAD 6 +#define STROKE_LENGTH 32 +#define IMAGE_WIDTH (PAD + (STROKE_LENGTH + PAD) * ARRAY_SIZE(dashes)) +#define IMAGE_HEIGHT (PAD + PAD * ARRAY_SIZE(int_offset) + PAD * ARRAY_SIZE(frac_offset) * ARRAY_SIZE(int_offset)) + + +static cairo_test_status_t +draw (cairo_t *cr, int width, int height) +{ + double total; + size_t i, j, k; + + cairo_set_source_rgb (cr, 1, 1, 1); + cairo_paint (cr); + + cairo_set_source_rgb (cr, 0, 0, 0); + cairo_set_line_width (cr, 2); + + total = 0.0; + for (k = 0; k < ARRAY_SIZE(dashes); ++k) { + total += dashes[k]; + for (i = 0; i < ARRAY_SIZE(frac_offset); ++i) { + for (j = 0; j < ARRAY_SIZE(int_offset); ++j) { + cairo_set_dash (cr, dashes, k + 1, frac_offset[i] + total * int_offset[j]); + cairo_move_to (cr, (STROKE_LENGTH + PAD) * k + PAD, PAD * (i + j + ARRAY_SIZE(frac_offset) * j + 1)); + cairo_line_to (cr, (STROKE_LENGTH + PAD) * (k + 1), PAD * (i + j + ARRAY_SIZE(frac_offset) * j + 1)); + cairo_stroke (cr); + } + } + } + + return CAIRO_TEST_SUCCESS; +} + +CAIRO_TEST (dash_offset, + "Tests dashes of different length with various offsets", + "stroke, dash", /* keywords */ + NULL, /* requirements */ + IMAGE_WIDTH, IMAGE_HEIGHT, + NULL, draw) diff --git a/test/dash-offset.ref.png b/test/dash-offset.ref.png new file mode 100644 index 0000000000000000000000000000000000000000..52600c435d1274f9ee2eb6ce0e8c8e28f049c2c4 GIT binary patch literal 794 zcmeAS@N?(olHy`uVBq!ia0vp^^MH5`2NRHF)NfS>Qfx`y?k)`fL2$v|<&zm0n9h5; zIEGZrd3*a{)*AyJw}(r<{Ee^Nb>Y~9TN<5@4Ua#Mp4zRJ^;7Ug*O{L`Yxo5J*8CQ~ z5ZxnoI%8vx*z4{8mVdVCf86o)Rqy=kZzQ7T?~SV8`uN7I2Un8j{(IhjYUNR*D4oSe zf2BL~Y3HmhwrUI9{qbtwOue78CIxptZR>e@B}r0u+Qp>YT4%mJcP%WoM&zA{@B@iR z>RwxB{-o~g=W>Hzvc|FRu1=W~rDL9=vm9bG*m?w!-6{R)Pj%_t?O$iNR9}Dg?|wx1 zFJIfG70$u&vOyYouUZST^Ux>ak= z*yzRw7iVp}Ghrjp!o@)Mukp=4v9>SqOmdKI;Vst06$5S AMF0Q* literal 0 HcmV?d00001