From 43e2370b024f66d995c514fd53414d3d8588a481 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 3 Nov 2008 14:20:35 +0000 Subject: [PATCH] [test] Update extend-pad. extend-pad was not a clear demonstration of the EXTEND_PAD mode, so revamp it to show the filter extending a 4 pixel surface to cover the entire output. However, this hides a discrepancy with the vector surfaces that we cannot prevent the external renders from applying an interpolation to the border pixels, so we copy the original test to extend-pad-border to check the desired behaviour on boundary pixels. --- test/Makefile.am | 4 ++ test/extend-pad-border.c | 95 ++++++++++++++++++++++++++++++++ test/extend-pad-border.ref.png | Bin 0 -> 616 bytes test/extend-pad-similar.c | 82 +++++++++++++++++++++++++++ test/extend-pad-similar.ref.png | Bin 0 -> 315 bytes test/extend-pad.c | 50 +++++++---------- test/extend-pad.ref.png | Bin 616 -> 315 bytes 7 files changed, 200 insertions(+), 31 deletions(-) create mode 100644 test/extend-pad-border.c create mode 100644 test/extend-pad-border.ref.png create mode 100644 test/extend-pad-similar.c create mode 100644 test/extend-pad-similar.ref.png diff --git a/test/Makefile.am b/test/Makefile.am index 948716a08..c2a87ee87 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -51,6 +51,8 @@ test_sources = \ device-offset-positive.c \ device-offset-scale.c \ extend-pad.c \ + extend-pad-border.c \ + extend-pad-similar.c \ extend-reflect.c \ extend-reflect-similar.c \ extend-repeat.c \ @@ -439,6 +441,8 @@ REFERENCE_IMAGES = \ device-offset.rgb24.ref.png \ device-offset-scale.ref.png \ extend-pad.ref.png \ + extend-pad-border.ref.png \ + extend-pad-similar.ref.png \ extend-reflect.ref.png \ extend-reflect-similar.ref.png \ extend-reflect-similar.ps2.ref.png \ diff --git a/test/extend-pad-border.c b/test/extend-pad-border.c new file mode 100644 index 000000000..79a81fcfd --- /dev/null +++ b/test/extend-pad-border.c @@ -0,0 +1,95 @@ +/* + * Copyright © 2007 Red Hat, Inc. + * + * 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. + * + * Author: Behdad Esfahbod + */ + +#include +#include "cairo-test.h" +#include + +#define SIZE 90 + +/* Check the border-pixels of an EXTEND_PAD image pattern */ + +static cairo_test_status_t +draw (cairo_t *cr, int width, int height) +{ + cairo_surface_t *surface; + cairo_t * cr_surface; + int surface_size = (SIZE - 30) / 10; + + cairo_set_source_rgba (cr, 0, 0, 0, 1); + cairo_rectangle (cr, 0, 0, SIZE, SIZE); + cairo_fill (cr); + + /* Create an image surface with my favorite four colors in each + * quadrant. */ + surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, + surface_size, surface_size); + cr_surface = cairo_create (surface); + cairo_surface_destroy (surface); + + cairo_set_source_rgb (cr_surface, 1, 1, 1); + cairo_rectangle (cr_surface, + 0, 0, + surface_size / 2, surface_size / 2); + cairo_fill (cr_surface); + cairo_set_source_rgb (cr_surface, 1, 0, 0); + cairo_rectangle (cr_surface, + surface_size / 2, 0, + surface_size / 2, surface_size / 2); + cairo_fill (cr_surface); + cairo_set_source_rgb (cr_surface, 0, 1, 0); + cairo_rectangle (cr_surface, + 0, surface_size / 2, + surface_size / 2, surface_size / 2); + cairo_fill (cr_surface); + cairo_set_source_rgb (cr_surface, 0, 0, 1); + cairo_rectangle (cr_surface, + surface_size / 2, surface_size / 2, + surface_size / 2, surface_size / 2); + cairo_fill (cr_surface); + + cairo_scale (cr, 10, 10); + cairo_set_source_surface (cr, cairo_get_target (cr_surface), 1.5, 1.5); + cairo_destroy (cr_surface); + + /* Using EXTEND_REFLECT makes this test pass for image and xlib backends */ + /*cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REFLECT);*/ + + cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_PAD); + cairo_rectangle (cr, 1.5, 1.5, 6, 6); + cairo_clip (cr); + + cairo_paint (cr); + + return CAIRO_TEST_SUCCESS; +} + +CAIRO_TEST (extend_pad_border, + "Test CAIRO_EXTEND_PAD for surface patterns", + "XFAIL=!image,pdf,ps,svg extend", /* keywords */ + NULL, /* requirements */ + SIZE, SIZE, + NULL, draw) diff --git a/test/extend-pad-border.ref.png b/test/extend-pad-border.ref.png new file mode 100644 index 0000000000000000000000000000000000000000..9292f8bbfc1c0f27877b8cbde88dc236c16242c4 GIT binary patch literal 616 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S901|%(3I5Gh#wj^(N7l!{JxM1({$v_eI5>H=O z_UlYyg3^*QPs%wN7?`*`T^vIy=DfXq*6+51gxkZ%4jv1Zbmvw5zkaoL)9Yn!e>6;V z?4ox}VeNX_e0N`eimF7fiKW!d!W8oZoipyd+N}Ozzek3rlebXRqzjW;rm1XES*XgX z>xm>3(@8i3_{q2+BOt+r1UD(uPF#;W4AOqE%dR}YA9Ch?$P3@^|4mDOSa20v-e(H? z(iwI1e8`i37d9^KyJ&uQU#0z}eGQ^_0}{jUUfUnP|EBq~xbrV{6I|ni+B@GqDE)hG zU!Z(y5jRJz>)bD8&HLNc58r-Q`uW|9oe>8XF1Ek;^}b$Sg{|a0ru)0zM$I_=Q*6Vc z-`x}c-9GvuWyfNr`sItxUuRm!0~B)qx6kNKz{lT*kJmii&WAUUF+vC)6`3=B|6TXL hV+~S_U{(Btm1$+fx3AIVw}1(S!PC{xWt~$(699aK6gL0> literal 0 HcmV?d00001 diff --git a/test/extend-pad-similar.c b/test/extend-pad-similar.c new file mode 100644 index 000000000..357252ac2 --- /dev/null +++ b/test/extend-pad-similar.c @@ -0,0 +1,82 @@ +/* + * Copyright © 2007 Red Hat, Inc. + * + * 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. + * + * Author: Behdad Esfahbod + */ + +#include +#include "cairo-test.h" +#include + +#define SIZE 90 + +static cairo_test_status_t +draw (cairo_t *cr, int width, int height) +{ + cairo_surface_t *surface; + cairo_t *cr_surface; + + /* Create a 4-pixel similar surface with my favorite four colors in each + * quadrant. */ + surface = cairo_surface_create_similar (cairo_get_group_target (cr), + CAIRO_CONTENT_COLOR, 2, 2); + cr_surface = cairo_create (surface); + cairo_surface_destroy (surface); + + /* upper-left = white */ + cairo_set_source_rgb (cr_surface, 1, 1, 1); + cairo_rectangle (cr_surface, 0, 0, 1, 1); + cairo_fill (cr_surface); + + /* upper-right = red */ + cairo_set_source_rgb (cr_surface, 1, 0, 0); + cairo_rectangle (cr_surface, 1, 0, 1, 1); + cairo_fill (cr_surface); + + /* lower-left = green */ + cairo_set_source_rgb (cr_surface, 0, 1, 0); + cairo_rectangle (cr_surface, 0, 1, 1, 1); + cairo_fill (cr_surface); + + /* lower-right = blue */ + cairo_set_source_rgb (cr_surface, 0, 0, 1); + cairo_rectangle (cr_surface, 1, 1, 1, 1); + cairo_fill (cr_surface); + + /* Now use extend pad to cover the entire surface with those 4 colors */ + cairo_set_source_surface (cr, cairo_get_target (cr_surface), + width/2 - 1, + height/2 - 1); + cairo_destroy (cr_surface); + cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_PAD); + cairo_paint (cr); + + return CAIRO_TEST_SUCCESS; +} + +CAIRO_TEST (extend_pad_similar, + "Test CAIRO_EXTEND_PAD for similar surface patterns", + "extend", /* keywords */ + NULL, /* requirements */ + SIZE, SIZE, + NULL, draw) diff --git a/test/extend-pad-similar.ref.png b/test/extend-pad-similar.ref.png new file mode 100644 index 0000000000000000000000000000000000000000..82da7b65a302c8728820633af7d96bd5f18f0642 GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S901|%(3I5Gh#wj^(N7l!{JxM1({$v}}0o-U3d z6?5L+Imp{!z{9YSZR7t_scd%bT5mWP1@AlgX76{avuCag?IpoVS9*`}chvL0oEt7u-Ebrq+r$d7Zmr+k`v>TE22WQ%mvv4FO#tYu Ba902T literal 0 HcmV?d00001 diff --git a/test/extend-pad.c b/test/extend-pad.c index ed4ffd023..15a2079b9 100644 --- a/test/extend-pad.c +++ b/test/extend-pad.c @@ -34,52 +34,40 @@ static cairo_test_status_t draw (cairo_t *cr, int width, int height) { cairo_surface_t *surface; - cairo_t * cr_surface; - int surface_size = (SIZE - 30) / 10; + cairo_t *cr_surface; - cairo_set_source_rgba (cr, 0, 0, 0, 1); - cairo_rectangle (cr, 0, 0, SIZE, SIZE); - cairo_fill (cr); - - /* Create an image surface with my favorite four colors in each + /* Create a 4-pixel image surface with my favorite four colors in each * quadrant. */ - surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, - surface_size, surface_size); + surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, 2, 2); cr_surface = cairo_create (surface); cairo_surface_destroy (surface); + /* upper-left = white */ cairo_set_source_rgb (cr_surface, 1, 1, 1); - cairo_rectangle (cr_surface, - 0, 0, - surface_size / 2, surface_size / 2); + cairo_rectangle (cr_surface, 0, 0, 1, 1); cairo_fill (cr_surface); + + /* upper-right = red */ cairo_set_source_rgb (cr_surface, 1, 0, 0); - cairo_rectangle (cr_surface, - surface_size / 2, 0, - surface_size / 2, surface_size / 2); + cairo_rectangle (cr_surface, 1, 0, 1, 1); cairo_fill (cr_surface); + + /* lower-left = green */ cairo_set_source_rgb (cr_surface, 0, 1, 0); - cairo_rectangle (cr_surface, - 0, surface_size / 2, - surface_size / 2, surface_size / 2); + cairo_rectangle (cr_surface, 0, 1, 1, 1); cairo_fill (cr_surface); + + /* lower-right = blue */ cairo_set_source_rgb (cr_surface, 0, 0, 1); - cairo_rectangle (cr_surface, - surface_size / 2, surface_size / 2, - surface_size / 2, surface_size / 2); + cairo_rectangle (cr_surface, 1, 1, 1, 1); cairo_fill (cr_surface); - cairo_scale (cr, 10, 10); - cairo_set_source_surface (cr, cairo_get_target (cr_surface), 1.5, 1.5); + /* Now use extend pad to cover the entire surface with those 4 colors */ + cairo_set_source_surface (cr, cairo_get_target (cr_surface), + width/2 - 1, + height/2 - 1); cairo_destroy (cr_surface); - - /* Using EXTEND_REFLECT makes this test pass for image and xlib backends */ - /*cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REFLECT);*/ - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_PAD); - cairo_rectangle (cr, 1.5, 1.5, 6, 6); - cairo_clip (cr); - cairo_paint (cr); return CAIRO_TEST_SUCCESS; @@ -87,7 +75,7 @@ draw (cairo_t *cr, int width, int height) CAIRO_TEST (extend_pad, "Test CAIRO_EXTEND_PAD for surface patterns", - "XFAIL=!image,pdf,ps,svg extend", /* keywords */ + "extend", /* keywords */ NULL, /* requirements */ SIZE, SIZE, NULL, draw) diff --git a/test/extend-pad.ref.png b/test/extend-pad.ref.png index 9292f8bbfc1c0f27877b8cbde88dc236c16242c4..82da7b65a302c8728820633af7d96bd5f18f0642 100644 GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S901|%(3I5Gh#wj^(N7l!{JxM1({$v}}0o-U3d z6?5L+Imp{!z{9YSZR7t_scd%bT5mWP1@AlgX76{avuCag?IpoVS9*`}chvL0oEt7u-Ebrq+r$d7Zmr+k`v>TE22WQ%mvv4FO#tYu Ba902T literal 616 zcmeAS@N?(olHy`uVBq!ia0vp^Q6S901|%(3I5Gh#wj^(N7l!{JxM1({$v_eI5>H=O z_UlYyg3^*QPs%wN7?`*`T^vIy=DfXq*6+51gxkZ%4jv1Zbmvw5zkaoL)9Yn!e>6;V z?4ox}VeNX_e0N`eimF7fiKW!d!W8oZoipyd+N}Ozzek3rlebXRqzjW;rm1XES*XgX z>xm>3(@8i3_{q2+BOt+r1UD(uPF#;W4AOqE%dR}YA9Ch?$P3@^|4mDOSa20v-e(H? z(iwI1e8`i37d9^KyJ&uQU#0z}eGQ^_0}{jUUfUnP|EBq~xbrV{6I|ni+B@GqDE)hG zU!Z(y5jRJz>)bD8&HLNc58r-Q`uW|9oe>8XF1Ek;^}b$Sg{|a0ru)0zM$I_=Q*6Vc z-`x}c-9GvuWyfNr`sItxUuRm!0~B)qx6kNKz{lT*kJmii&WAUUF+vC)6`3=B|6TXL hV+~S_U{(Btm1$+fx3AIVw}1(S!PC{xWt~$(699aK6gL0>