diff options
author | Adrian Johnson <ajohnson@redneon.com> | 2023-01-27 19:18:10 +1030 |
---|---|---|
committer | Adrian Johnson <ajohnson@redneon.com> | 2023-01-27 20:22:18 +1030 |
commit | 9e59808ecb5f39e551e5e2ffbdab08c8ec66d21b (patch) | |
tree | de19fe59be58a137e9af25b109123892c37c2979 /test | |
parent | c8695f050340bff1dc2b3a64cf8386c5ad19c274 (diff) | |
download | cairo-9e59808ecb5f39e551e5e2ffbdab08c8ec66d21b.tar.gz |
svg: test foreground colors
Convert the ft-svg-render-palette test to a color test that test
both palettes and foreground colors.
Diffstat (limited to 'test')
-rw-r--r-- | test/cairo-svg-test-color.ttx (renamed from test/cairo-svg-test-palette.ttx) | 8 | ||||
-rw-r--r-- | test/ft-svg-render-color.c (renamed from test/ft-svg-render-palette.c) | 6 | ||||
-rw-r--r-- | test/meson.build | 4 | ||||
-rw-r--r-- | test/reference/ft-svg-render-color.ref.png | bin | 0 -> 4117 bytes | |||
-rw-r--r-- | test/reference/ft-svg-render-palette.ref.png | bin | 485 -> 0 bytes | |||
-rw-r--r-- | test/svg/color.0.color0.svg (renamed from test/svg/palette.0.color0.svg) | 0 | ||||
-rw-r--r-- | test/svg/color.1.color1.svg (renamed from test/svg/palette.1.color1.svg) | 0 | ||||
-rw-r--r-- | test/svg/color.2.foreground-solid.svg | 4 | ||||
-rw-r--r-- | test/svg/color.3.foreground-alpha.svg | 4 | ||||
-rw-r--r-- | test/svg/color.4.foreground-linear.svg | 10 | ||||
-rw-r--r-- | test/svg/color.5.foreground-linear-alpha.svg | 10 | ||||
-rw-r--r-- | test/svg/color.6.foreground-radial.svg | 10 | ||||
-rw-r--r-- | test/svg/color.7.foreground-radial-alpha.svg | 10 |
13 files changed, 57 insertions, 9 deletions
diff --git a/test/cairo-svg-test-palette.ttx b/test/cairo-svg-test-color.ttx index 1b0630913..a915a704b 100644 --- a/test/cairo-svg-test-palette.ttx +++ b/test/cairo-svg-test-color.ttx @@ -18,12 +18,12 @@ <!-- Most of this table will be recalculated by the compiler --> <tableVersion value="1.0"/> <fontRevision value="1.0"/> - <checkSumAdjustment value="0x1b8ac35c"/> + <checkSumAdjustment value="0x1d3a9a74"/> <magicNumber value="0x5f0f3cf5"/> <flags value="00000000 00000011"/> <unitsPerEm value="1000"/> <created value="Wed Jun 15 00:00:00 2022"/> - <modified value="Fri Jan 27 07:13:15 2023"/> + <modified value="Fri Jan 27 08:44:23 2023"/> <xMin value="0"/> <yMin value="0"/> <xMax value="1000"/> @@ -248,13 +248,13 @@ <name> <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409"> - Cairo Svg Test Palette + Cairo Svg Test Color </namerecord> <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409"> Regular </namerecord> <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409"> - Cairo Svg Test Palette Regular + Cairo Svg Test Color Regular </namerecord> </name> diff --git a/test/ft-svg-render-palette.c b/test/ft-svg-render-color.c index eee5f27c8..c7572d5b0 100644 --- a/test/ft-svg-render-palette.c +++ b/test/ft-svg-render-color.c @@ -32,7 +32,7 @@ #define WIDTH (FONT_SIZE*8 + MARGIN*9) #define HEIGHT (FONT_SIZE*2 + MARGIN*3) -#define FONT_FILE "cairo-svg-test-palette.ttf" +#define FONT_FILE "cairo-svg-test-color.ttf" #define PALETTE_TEXT "01" #define FOREGROUND_TEXT "234567" @@ -90,8 +90,8 @@ draw (cairo_t *cr, int width, int height) return CAIRO_TEST_SUCCESS; } -CAIRO_TEST (ft_svg_render_palette, - "Test cairo SVG font palettes", +CAIRO_TEST (ft_svg_render_color, + "Test cairo SVG font colors", "svgrender", /* keywords */ NULL, /* requirements */ WIDTH, HEIGHT, diff --git a/test/meson.build b/test/meson.build index 275dd07d7..e5b4f89d5 100644 --- a/test/meson.build +++ b/test/meson.build @@ -436,7 +436,7 @@ test_ft_svg_font_sources = [ test_ft_svg_ttx_font_sources = [ 'ft-svg-cairo-logo.c', 'ft-svg-render.c', - 'ft-svg-render-palette.c' + 'ft-svg-render-color.c' ] test_gl_sources = [ @@ -532,10 +532,10 @@ ps2png_sources = [ test_ttx_fonts = [ 'cairo-logo-font.ttx', + 'cairo-svg-test-color.ttx', 'cairo-svg-test-doc.ttx', 'cairo-svg-test-fill.ttx', 'cairo-svg-test-gradient.ttx', - 'cairo-svg-test-palette.ttx', 'cairo-svg-test-path.ttx', 'cairo-svg-test-shapes.ttx', 'cairo-svg-test-stroke.ttx', diff --git a/test/reference/ft-svg-render-color.ref.png b/test/reference/ft-svg-render-color.ref.png Binary files differnew file mode 100644 index 000000000..d688c378c --- /dev/null +++ b/test/reference/ft-svg-render-color.ref.png diff --git a/test/reference/ft-svg-render-palette.ref.png b/test/reference/ft-svg-render-palette.ref.png Binary files differdeleted file mode 100644 index 4a86f995b..000000000 --- a/test/reference/ft-svg-render-palette.ref.png +++ /dev/null diff --git a/test/svg/palette.0.color0.svg b/test/svg/color.0.color0.svg index 650dca898..650dca898 100644 --- a/test/svg/palette.0.color0.svg +++ b/test/svg/color.0.color0.svg diff --git a/test/svg/palette.1.color1.svg b/test/svg/color.1.color1.svg index 2858b35ca..2858b35ca 100644 --- a/test/svg/palette.1.color1.svg +++ b/test/svg/color.1.color1.svg diff --git a/test/svg/color.2.foreground-solid.svg b/test/svg/color.2.foreground-solid.svg new file mode 100644 index 000000000..cf77d65a6 --- /dev/null +++ b/test/svg/color.2.foreground-solid.svg @@ -0,0 +1,4 @@ +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"> + <rect x="100" y="-750" width="800" height="500" + fill="currentColor" /> +</svg> diff --git a/test/svg/color.3.foreground-alpha.svg b/test/svg/color.3.foreground-alpha.svg new file mode 100644 index 000000000..fa67d4929 --- /dev/null +++ b/test/svg/color.3.foreground-alpha.svg @@ -0,0 +1,4 @@ +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"> + <rect x="100" y="-750" width="800" height="500" + fill="currentColor" fill-opacity="0.5" /> +</svg> diff --git a/test/svg/color.4.foreground-linear.svg b/test/svg/color.4.foreground-linear.svg new file mode 100644 index 000000000..d2f8816c6 --- /dev/null +++ b/test/svg/color.4.foreground-linear.svg @@ -0,0 +1,10 @@ +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"> + <defs> + <linearGradient id="grad" x1="33%" x21="66%"> + <stop offset="0%" stop-color="currentColor" stop-opacity="1" /> + <stop offset="100%" stop-color="red" stop-opacity="1" /> + </linearGradient> + </defs> + <rect x="100" y="-900" width="800" height="800" fill="url(#grad)" /> +</svg> + diff --git a/test/svg/color.5.foreground-linear-alpha.svg b/test/svg/color.5.foreground-linear-alpha.svg new file mode 100644 index 000000000..a3c453ad3 --- /dev/null +++ b/test/svg/color.5.foreground-linear-alpha.svg @@ -0,0 +1,10 @@ +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"> + <defs> + <linearGradient id="grad" x1="33%" x21="66%"> + <stop offset="0%" stop-color="currentColor" stop-opacity="0.3" /> + <stop offset="100%" stop-color="red" stop-opacity="0.3" /> + </linearGradient> + </defs> + <rect x="100" y="-900" width="800" height="800" fill="url(#grad)" /> +</svg> + diff --git a/test/svg/color.6.foreground-radial.svg b/test/svg/color.6.foreground-radial.svg new file mode 100644 index 000000000..97622c2b4 --- /dev/null +++ b/test/svg/color.6.foreground-radial.svg @@ -0,0 +1,10 @@ +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"> + <defs> + <radialGradient id="grad" cx="50%" cy="50%" + fx="0.75" fy="0.35" r="0.5"> + <stop offset="0%" stop-color="currentColor" stop-opacity="1" /> + <stop offset="100%" stop-color="blue" stop-opacity="1" /> + </radialGradient> + </defs> + <rect x="100" y="-900" width="800" height="800" fill="url(#grad)" /> +</svg> diff --git a/test/svg/color.7.foreground-radial-alpha.svg b/test/svg/color.7.foreground-radial-alpha.svg new file mode 100644 index 000000000..76d6628e0 --- /dev/null +++ b/test/svg/color.7.foreground-radial-alpha.svg @@ -0,0 +1,10 @@ +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"> + <defs> + <radialGradient id="grad" cx="50%" cy="50%" + fx="0.75" fy="0.35" r="0.5"> + <stop offset="0%" stop-color="currentColor" stop-opacity="0.5" /> + <stop offset="100%" stop-color="blue" stop-opacity="0.5" /> + </radialGradient> + </defs> + <rect x="100" y="-900" width="800" height="800" fill="url(#grad)" /> +</svg> |