2 commits - .gitlab-ci.yml src/cairo-cff-subset.c src/cairo-image-surface.c src/cairo-truetype-subset.c src/cairo-type1-fallback.c src/cairo-type1-subset.c test/reference

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue May 21 09:41:19 UTC 2024 

 .gitlab-ci.yml                                                    |    6 ++--
 dev/null                                                          |binary
 src/cairo-cff-subset.c                                            |   14 +++++-----
 src/cairo-image-surface.c                                         |    2 -
 src/cairo-truetype-subset.c                                       |    3 --
 src/cairo-type1-fallback.c                                        |    4 +-
 src/cairo-type1-subset.c                                          |    2 -
 test/reference/big-line.ps.ref.png                                |binary
 test/reference/bug-source-cu.ps.ref.png                           |binary
 test/reference/clip-disjoint-quad.ps.ref.png                      |binary
 test/reference/clip-fill-rule-pixel-aligned.ps.rgb24.ref.png      |binary
 test/reference/clip-rectilinear.ps.ref.png                        |binary
 test/reference/coverage-intersecting-quads.xlib.xfail.png         |binary
 test/reference/coverage-intersecting-triangles.image.xfail.png    |binary
 test/reference/coverage-intersecting-triangles.xlib.xfail.png     |binary
 test/reference/coverage-rectangles.xlib.xfail.png                 |binary
 test/reference/coverage-row-triangles.xlib.xfail.png              |binary
 test/reference/coverage-triangles.image.ref.png                   |binary
 test/reference/coverage-triangles.recording.ref.png               |binary
 test/reference/coverage-triangles.script.ref.png                  |binary
 test/reference/coverage-triangles.xcb-fallback.rgb24.xfail.png    |binary
 test/reference/coverage-triangles.xcb-render-0_0.xfail.png        |binary
 test/reference/coverage-triangles.xlib-render-0_0.rgb24.ref.png   |binary
 test/reference/coverage-triangles.xlib-render.rgb24.xfail.png     |binary
 test/reference/coverage-triangles.xlib.xfail.png                  |binary
 test/reference/dithergradient.image.argb32.ref.png                |binary
 test/reference/dithergradient.image.rgb24.ref.png                 |binary
 test/reference/dithergradient.image16.rgb24.ref.png               |binary
 test/reference/extended-blend-alpha-mask.argb32.ref.png           |binary
 test/reference/ft-color-font.image16.ref.png                      |binary
 test/reference/ft-color-font.ref.png                              |binary
 test/reference/ft-color-font.script.xfail.png                     |binary
 test/reference/ft-variable-font.script.xfail.png                  |binary
 test/reference/implicit-close.ps.ref.png                          |binary
 test/reference/line-width-large-overlap-rotated.ps.ref.png        |binary
 test/reference/linear-gradient-one-stop.ps.rgb24.ref.png          |binary
 test/reference/long-lines.ps.ref.png                              |binary
 test/reference/partial-clip-text-bottom.ps.ref.png                |binary
 test/reference/partial-clip-text-left.ps.ref.png                  |binary
 test/reference/pdf-operators-text.script.xfail.png                |binary
 test/reference/record-replay-extend-repeat.svg.argb32.ref.png     |binary
 test/reference/record-replay-extend-repeat.svg.rgb24.ref.png      |binary
 test/reference/recording-surface-extend-repeat.svg.argb32.ref.png |binary
 test/reference/recording-surface-extend-repeat.svg.rgb24.ref.png  |binary
 test/reference/self-copy-overlap.xcb.argb32.ref.png               |binary
 test/reference/self-copy-overlap.xlib.argb32.ref.png              |binary
 test/reference/self-copy.ps.ref.png                               |binary
 test/reference/self-intersecting.xcb-window&.rgb24.ref.png        |binary
 test/reference/self-intersecting.xcb-window.rgb24.ref.png         |binary
 test/reference/self-intersecting.xcb.ref.png                      |binary
 test/reference/self-intersecting.xlib-window.rgb24.ref.png        |binary
 test/reference/self-intersecting.xlib.ref.png                     |binary
 test/reference/text-unhinted-metrics.xcb-render-0_0.ref.png       |binary
 test/reference/text-unhinted-metrics.xcb-window&.rgb24.ref.png    |binary
 test/reference/text-unhinted-metrics.xcb-window.rgb24.ref.png     |binary
 test/reference/user-font-color.pdf.xfail.png                      |binary
 test/reference/user-font-color.script.xfail.png                   |binary
 test/reference/user-font-mask.image16.ref.png                     |binary
 test/reference/user-font-subpixel.xcb-render-0_0.ref.png          |binary
 test/reference/user-font-subpixel.xcb-window&.rgb24.ref.png       |binary
 test/reference/user-font-subpixel.xcb-window.rgb24.ref.png        |binary
 test/reference/user-font-subpixel.xcb.ref.png                     |binary
 62 files changed, 15 insertions(+), 16 deletions(-)

New commits:
commit 54cbe514812021fff27f55c380e7f5c86d2134ba
Merge: c75997a4e 293b75a1c
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Tue May 21 09:41:13 2024 +0000

    Merge branch 'update-to-fedora-40' into 'master'
    
    Update CI to Fedora 40
    
    See merge request cairo/cairo!546

commit 293b75a1c4859412b4c6a1bd65b34e61fc0da2be
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Fri Apr 26 14:48:24 2024 +0930

    Update CI to Fedora 40

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b3a1a6ae..569aecfc9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
 include:
   - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
   - project: 'freedesktop/ci-templates'
-    ref: '7811ba9814a3bad379377241c6c6b62d78b20eac'
+    ref: '98b1218f146a1ec96d65e3ce0041f9a6ec5cb5e6'
     file: '/templates/fedora.yml'
 
 # From https://gitlab.freedesktop.org/freedesktop/ci-templates/-/blob/master/src/gitlab-ci.tmpl
@@ -15,8 +15,8 @@ workflow:
 
 variables:
   FDO_UPSTREAM_REPO: 'cairo/cairo'
-  FDO_DISTRIBUTION_VERSION: '38'
-  FDO_DISTRIBUTION_TAG: '2023-08-28.1'
+  FDO_DISTRIBUTION_VERSION: '40'
+  FDO_DISTRIBUTION_TAG: '2024-04-26.0'
 
   # TODO: should probably get its own image at some point instead of reusing the GStreamer one
   # See https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/.gitlab-image-tags.yml for latest
diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c
index fd74d2ddc..284eb8df1 100644
--- a/src/cairo-cff-subset.c
+++ b/src/cairo-cff-subset.c
@@ -1021,31 +1021,31 @@ cairo_cff_font_read_cid_fontdict (cairo_cff_font_t *font, unsigned char *ptr)
 
     font->num_fontdicts = _cairo_array_num_elements (&index);
 
-    font->fd_dict = calloc (sizeof (cairo_hash_table_t *), font->num_fontdicts);
+    font->fd_dict = calloc (font->num_fontdicts, sizeof (cairo_hash_table_t *));
     if (unlikely (font->fd_dict == NULL)) {
         status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
         goto fail;
     }
 
-    font->fd_private_dict = calloc (sizeof (cairo_hash_table_t *), font->num_fontdicts);
+    font->fd_private_dict = calloc (font->num_fontdicts, sizeof (cairo_hash_table_t *));
     if (unlikely (font->fd_private_dict == NULL)) {
         status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
         goto fail;
     }
 
-    font->fd_local_sub_index = calloc (sizeof (cairo_array_t), font->num_fontdicts);
+    font->fd_local_sub_index = calloc (font->num_fontdicts, sizeof (cairo_array_t));
     if (unlikely (font->fd_local_sub_index == NULL)) {
         status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
         goto fail;
     }
 
-    font->fd_local_sub_bias = calloc (sizeof (int), font->num_fontdicts);
+    font->fd_local_sub_bias = calloc (font->num_fontdicts, sizeof (int));
     if (unlikely (font->fd_local_sub_bias == NULL)) {
         status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
         goto fail;
     }
 
-    font->fd_local_subs_used = calloc (sizeof (cairo_bool_t *), font->num_fontdicts);
+    font->fd_local_subs_used = calloc (font->num_fontdicts, sizeof (cairo_bool_t *));
     if (unlikely (font->fd_local_subs_used == NULL)) {
         status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
         goto fail;
@@ -2994,7 +2994,7 @@ _cairo_cff_subset_init (cairo_cff_subset_t          *cff_subset,
 	cff_subset->family_name_utf8 = NULL;
     }
 
-    cff_subset->widths = calloc (sizeof (double), font->scaled_font_subset->num_glyphs);
+    cff_subset->widths = calloc (font->scaled_font_subset->num_glyphs, sizeof (double));
     if (unlikely (cff_subset->widths == NULL)) {
 	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
 	goto fail3;
@@ -3407,7 +3407,7 @@ _cairo_cff_fallback_init (cairo_cff_subset_t          *cff_subset,
 	goto fail2;
     }
 
-    cff_subset->widths = calloc (sizeof (double), font->scaled_font_subset->num_glyphs);
+    cff_subset->widths = calloc (font->scaled_font_subset->num_glyphs, sizeof (double));
     if (unlikely (cff_subset->widths == NULL)) {
 	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
 	goto fail3;
diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
index c319b083c..1691aa14e 100644
--- a/src/cairo-image-surface.c
+++ b/src/cairo-image-surface.c
@@ -110,7 +110,7 @@ _cairo_format_from_pixman_format (pixman_format_code_t pixman_format)
     case PIXMAN_r5g6b5:
 	return CAIRO_FORMAT_RGB16_565;
     case PIXMAN_r8g8b8a8: case PIXMAN_r8g8b8x8:
-    case PIXMAN_a8r8g8b8_sRGB:
+    case PIXMAN_a8r8g8b8_sRGB: case PIXMAN_r8g8b8_sRGB:
     case PIXMAN_a8b8g8r8: case PIXMAN_x8b8g8r8: case PIXMAN_r8g8b8:
     case PIXMAN_b8g8r8:   case PIXMAN_b5g6r5:
     case PIXMAN_a1r5g5b5: case PIXMAN_x1r5g5b5: case PIXMAN_a1b5g5r5:
diff --git a/src/cairo-truetype-subset.c b/src/cairo-truetype-subset.c
index ce2e6ac6d..42fbffb40 100644
--- a/src/cairo-truetype-subset.c
+++ b/src/cairo-truetype-subset.c
@@ -1181,8 +1181,7 @@ cairo_truetype_subset_init_internal (cairo_truetype_subset_t     *truetype_subse
     /* The widths array returned must contain only widths for the
      * glyphs in font_subset. Any subglyphs appended after
      * font_subset->num_glyphs are omitted. */
-    truetype_subset->widths = calloc (sizeof (double),
-                                      font->scaled_font_subset->num_glyphs);
+    truetype_subset->widths = calloc (font->scaled_font_subset->num_glyphs, sizeof (double));
     if (unlikely (truetype_subset->widths == NULL)) {
 	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
 	goto fail3;
diff --git a/src/cairo-type1-fallback.c b/src/cairo-type1-fallback.c
index c81e85143..5b4223b25 100644
--- a/src/cairo-type1-fallback.c
+++ b/src/cairo-type1-fallback.c
@@ -747,7 +747,7 @@ _cairo_type1_fallback_init_internal (cairo_type1_subset_t	*type1_subset,
         goto fail1;
     }
 
-    type1_subset->widths = calloc (sizeof (double), font->scaled_font_subset->num_glyphs);
+    type1_subset->widths = calloc (font->scaled_font_subset->num_glyphs, sizeof (double));
     if (unlikely (type1_subset->widths == NULL)) {
         status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
         goto fail2;
@@ -841,7 +841,7 @@ _cairo_type2_charstrings_init (cairo_type2_charstrings_t *type2_subset,
 
     _cairo_array_init (&type2_subset->charstrings, sizeof (cairo_array_t));
 
-    type2_subset->widths = calloc (sizeof (int), font->scaled_font_subset->num_glyphs);
+    type2_subset->widths = calloc (font->scaled_font_subset->num_glyphs, sizeof (int));
     if (unlikely (type2_subset->widths == NULL)) {
         status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
         goto fail1;
diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
index 0388f374e..0118a79af 100644
--- a/src/cairo-type1-subset.c
+++ b/src/cairo-type1-subset.c
@@ -1782,7 +1782,7 @@ _cairo_type1_subset_init (cairo_type1_subset_t		*type1_subset,
     if (unlikely (type1_subset->base_font == NULL))
 	goto fail1;
 
-    type1_subset->widths = calloc (sizeof (double), scaled_font_subset->num_glyphs);
+    type1_subset->widths = calloc (scaled_font_subset->num_glyphs, sizeof (double));
     if (unlikely (type1_subset->widths == NULL))
 	goto fail2;
 
diff --git a/test/reference/big-line.ps.ref.png b/test/reference/big-line.ps.ref.png
index b5b227f8f..f498a8ab4 100644
Binary files a/test/reference/big-line.ps.ref.png and b/test/reference/big-line.ps.ref.png differ
diff --git a/test/reference/bug-source-cu.ps.argb32.ref.png b/test/reference/bug-source-cu.ps.ref.png
similarity index 74%
rename from test/reference/bug-source-cu.ps.argb32.ref.png
rename to test/reference/bug-source-cu.ps.ref.png
index ca0fdd934..51bcb3eca 100644
Binary files a/test/reference/bug-source-cu.ps.argb32.ref.png and b/test/reference/bug-source-cu.ps.ref.png differ
diff --git a/test/reference/bug-source-cu.ps.rgb24.ref.png b/test/reference/bug-source-cu.ps.rgb24.ref.png
deleted file mode 100644
index 5caf13915..000000000
Binary files a/test/reference/bug-source-cu.ps.rgb24.ref.png and /dev/null differ
diff --git a/test/reference/clip-disjoint-quad.ps.ref.png b/test/reference/clip-disjoint-quad.ps.ref.png
index d7c2621a4..411f8195a 100644
Binary files a/test/reference/clip-disjoint-quad.ps.ref.png and b/test/reference/clip-disjoint-quad.ps.ref.png differ
diff --git a/test/reference/clip-fill-rule-pixel-aligned.ps.rgb24.ref.png b/test/reference/clip-fill-rule-pixel-aligned.ps.rgb24.ref.png
index 01760134b..3ba525475 100644
Binary files a/test/reference/clip-fill-rule-pixel-aligned.ps.rgb24.ref.png and b/test/reference/clip-fill-rule-pixel-aligned.ps.rgb24.ref.png differ
diff --git a/test/reference/clip-rectilinear.ps.ref.png b/test/reference/clip-rectilinear.ps.ref.png
index 06a924069..575709ab7 100644
Binary files a/test/reference/clip-rectilinear.ps.ref.png and b/test/reference/clip-rectilinear.ps.ref.png differ
diff --git a/test/reference/coverage-intersecting-quads.xlib.xfail.png b/test/reference/coverage-intersecting-quads.xlib.xfail.png
index d6b8c2ef2..9e8806b9d 100644
Binary files a/test/reference/coverage-intersecting-quads.xlib.xfail.png and b/test/reference/coverage-intersecting-quads.xlib.xfail.png differ
diff --git a/test/reference/coverage-intersecting-triangles.image.xfail.png b/test/reference/coverage-intersecting-triangles.image.xfail.png
index c0290e492..f67ccd500 100644
Binary files a/test/reference/coverage-intersecting-triangles.image.xfail.png and b/test/reference/coverage-intersecting-triangles.image.xfail.png differ
diff --git a/test/reference/coverage-intersecting-triangles.xlib.xfail.png b/test/reference/coverage-intersecting-triangles.xlib.xfail.png
index e64cd4741..cf492c541 100644
Binary files a/test/reference/coverage-intersecting-triangles.xlib.xfail.png and b/test/reference/coverage-intersecting-triangles.xlib.xfail.png differ
diff --git a/test/reference/coverage-rectangles.xlib.xfail.png b/test/reference/coverage-rectangles.xlib.xfail.png
index 622c2d75e..4ad7ec5d2 100644
Binary files a/test/reference/coverage-rectangles.xlib.xfail.png and b/test/reference/coverage-rectangles.xlib.xfail.png differ
diff --git a/test/reference/coverage-row-triangles.xlib.xfail.png b/test/reference/coverage-row-triangles.xlib.xfail.png
index f8582fbb9..c55db811f 100644
Binary files a/test/reference/coverage-row-triangles.xlib.xfail.png and b/test/reference/coverage-row-triangles.xlib.xfail.png differ
diff --git a/test/reference/coverage-triangles.image.ref.png b/test/reference/coverage-triangles.image.ref.png
new file mode 100644
index 000000000..2094a6dda
Binary files /dev/null and b/test/reference/coverage-triangles.image.ref.png differ
diff --git a/test/reference/coverage-triangles.recording.ref.png b/test/reference/coverage-triangles.recording.ref.png
new file mode 100644
index 000000000..2094a6dda
Binary files /dev/null and b/test/reference/coverage-triangles.recording.ref.png differ
diff --git a/test/reference/coverage-triangles.script.ref.png b/test/reference/coverage-triangles.script.ref.png
new file mode 100644
index 000000000..2094a6dda
Binary files /dev/null and b/test/reference/coverage-triangles.script.ref.png differ
diff --git a/test/reference/coverage-triangles.xcb-fallback.rgb24.xfail.png b/test/reference/coverage-triangles.xcb-fallback.rgb24.xfail.png
new file mode 100644
index 000000000..2094a6dda
Binary files /dev/null and b/test/reference/coverage-triangles.xcb-fallback.rgb24.xfail.png differ
diff --git a/test/reference/coverage-triangles.xcb-render-0_0.xfail.png b/test/reference/coverage-triangles.xcb-render-0_0.xfail.png
new file mode 100644
index 000000000..2094a6dda
Binary files /dev/null and b/test/reference/coverage-triangles.xcb-render-0_0.xfail.png differ
diff --git a/test/reference/coverage-triangles.xfail.png b/test/reference/coverage-triangles.xfail.png
deleted file mode 100644
index dea5983ae..000000000
Binary files a/test/reference/coverage-triangles.xfail.png and /dev/null differ
diff --git a/test/reference/coverage-triangles.xlib-render-0_0.rgb24.ref.png b/test/reference/coverage-triangles.xlib-render-0_0.rgb24.ref.png
new file mode 100644
index 000000000..2094a6dda
Binary files /dev/null and b/test/reference/coverage-triangles.xlib-render-0_0.rgb24.ref.png differ
diff --git a/test/reference/coverage-triangles.xlib-render.rgb24.xfail.png b/test/reference/coverage-triangles.xlib-render.rgb24.xfail.png
new file mode 100644
index 000000000..2094a6dda
Binary files /dev/null and b/test/reference/coverage-triangles.xlib-render.rgb24.xfail.png differ
diff --git a/test/reference/coverage-triangles.xlib.xfail.png b/test/reference/coverage-triangles.xlib.xfail.png
index 133fd3384..aad003434 100644
Binary files a/test/reference/coverage-triangles.xlib.xfail.png and b/test/reference/coverage-triangles.xlib.xfail.png differ
diff --git a/test/reference/dithergradient.image.argb32.ref.png b/test/reference/dithergradient.image.argb32.ref.png
index c44e12380..f67d369f0 100644
Binary files a/test/reference/dithergradient.image.argb32.ref.png and b/test/reference/dithergradient.image.argb32.ref.png differ
diff --git a/test/reference/dithergradient.image.rgb24.ref.png b/test/reference/dithergradient.image.rgb24.ref.png
index c44e12380..f67d369f0 100644
Binary files a/test/reference/dithergradient.image.rgb24.ref.png and b/test/reference/dithergradient.image.rgb24.ref.png differ
diff --git a/test/reference/dithergradient.image16.rgb24.ref.png b/test/reference/dithergradient.image16.rgb24.ref.png
index fa1950a88..91c9f5e2d 100644
Binary files a/test/reference/dithergradient.image16.rgb24.ref.png and b/test/reference/dithergradient.image16.rgb24.ref.png differ
diff --git a/test/reference/extended-blend-alpha-mask.argb32.ref.png b/test/reference/extended-blend-alpha-mask.argb32.ref.png
index 13df56ffa..1b0eaf0cd 100644
Binary files a/test/reference/extended-blend-alpha-mask.argb32.ref.png and b/test/reference/extended-blend-alpha-mask.argb32.ref.png differ
diff --git a/test/reference/ft-color-font.image16.ref.png b/test/reference/ft-color-font.image16.ref.png
index 43b39dc37..f428cc065 100644
Binary files a/test/reference/ft-color-font.image16.ref.png and b/test/reference/ft-color-font.image16.ref.png differ
diff --git a/test/reference/ft-color-font.ref.png b/test/reference/ft-color-font.ref.png
index 9ccb673f7..d500fc026 100644
Binary files a/test/reference/ft-color-font.ref.png and b/test/reference/ft-color-font.ref.png differ
diff --git a/test/reference/ft-color-font.script.ref.png b/test/reference/ft-color-font.script.ref.png
deleted file mode 100644
index 15c054e19..000000000
Binary files a/test/reference/ft-color-font.script.ref.png and /dev/null differ
diff --git a/test/reference/ft-color-font.script.xfail.png b/test/reference/ft-color-font.script.xfail.png
index 238827723..6ec7a984e 100644
Binary files a/test/reference/ft-color-font.script.xfail.png and b/test/reference/ft-color-font.script.xfail.png differ
diff --git a/test/reference/ft-variable-font.script.xfail.png b/test/reference/ft-variable-font.script.xfail.png
index 0057da29c..8463a4a38 100644
Binary files a/test/reference/ft-variable-font.script.xfail.png and b/test/reference/ft-variable-font.script.xfail.png differ
diff --git a/test/reference/implicit-close.ps.ref.png b/test/reference/implicit-close.ps.ref.png
index cb84de031..66baf2480 100644
Binary files a/test/reference/implicit-close.ps.ref.png and b/test/reference/implicit-close.ps.ref.png differ
diff --git a/test/reference/line-width-large-overlap-rotated.ps.ref.png b/test/reference/line-width-large-overlap-rotated.ps.ref.png
index 3d500d9df..5bca185a9 100644
Binary files a/test/reference/line-width-large-overlap-rotated.ps.ref.png and b/test/reference/line-width-large-overlap-rotated.ps.ref.png differ
diff --git a/test/reference/line-width-large-overlap.base.argb32.ref.png b/test/reference/line-width-large-overlap.base.argb32.ref.png
deleted file mode 100644
index 3c3464bed..000000000
Binary files a/test/reference/line-width-large-overlap.base.argb32.ref.png and /dev/null differ
diff --git a/test/reference/line-width-large-overlap.base.rgb24.ref.png b/test/reference/line-width-large-overlap.base.rgb24.ref.png
deleted file mode 100644
index 3c3464bed..000000000
Binary files a/test/reference/line-width-large-overlap.base.rgb24.ref.png and /dev/null differ
diff --git a/test/reference/line-width-large-overlap.ps.ref.png b/test/reference/line-width-large-overlap.ps.ref.png
deleted file mode 100644
index 89092b9cb..000000000
Binary files a/test/reference/line-width-large-overlap.ps.ref.png and /dev/null differ
diff --git a/test/reference/linear-gradient-one-stop.ps.rgb24.ref.png b/test/reference/linear-gradient-one-stop.ps.rgb24.ref.png
index d54bba273..efc12ee71 100644
Binary files a/test/reference/linear-gradient-one-stop.ps.rgb24.ref.png and b/test/reference/linear-gradient-one-stop.ps.rgb24.ref.png differ
diff --git a/test/reference/long-lines.ps.ref.png b/test/reference/long-lines.ps.ref.png
index 79ae24cf5..e2ffa14d8 100644
Binary files a/test/reference/long-lines.ps.ref.png and b/test/reference/long-lines.ps.ref.png differ
diff --git a/test/reference/long-lines.ps.xfail.png b/test/reference/long-lines.ps.xfail.png
deleted file mode 100644
index 766efb75b..000000000
Binary files a/test/reference/long-lines.ps.xfail.png and /dev/null differ
diff --git a/test/reference/partial-clip-text-bottom.ps.ref.png b/test/reference/partial-clip-text-bottom.ps.ref.png
index 026bb421a..d4d82ddee 100644
Binary files a/test/reference/partial-clip-text-bottom.ps.ref.png and b/test/reference/partial-clip-text-bottom.ps.ref.png differ
diff --git a/test/reference/partial-clip-text-left.ps.ref.png b/test/reference/partial-clip-text-left.ps.ref.png
index 5c9b0fe36..7387e382e 100644
Binary files a/test/reference/partial-clip-text-left.ps.ref.png and b/test/reference/partial-clip-text-left.ps.ref.png differ
diff --git a/test/reference/pdf-operators-text.script.xfail.png b/test/reference/pdf-operators-text.script.xfail.png
index ae4df9932..62050a832 100644
Binary files a/test/reference/pdf-operators-text.script.xfail.png and b/test/reference/pdf-operators-text.script.xfail.png differ
diff --git a/test/reference/record-replay-extend-repeat.svg.argb32.ref.png b/test/reference/record-replay-extend-repeat.svg.argb32.ref.png
new file mode 100644
index 000000000..40a697d07
Binary files /dev/null and b/test/reference/record-replay-extend-repeat.svg.argb32.ref.png differ
diff --git a/test/reference/record-replay-extend-repeat.svg.ref.png b/test/reference/record-replay-extend-repeat.svg.ref.png
deleted file mode 100644
index 5e0746b39..000000000
Binary files a/test/reference/record-replay-extend-repeat.svg.ref.png and /dev/null differ
diff --git a/test/reference/record-replay-extend-repeat.svg.rgb24.ref.png b/test/reference/record-replay-extend-repeat.svg.rgb24.ref.png
index 3f52c58b2..025976531 100644
Binary files a/test/reference/record-replay-extend-repeat.svg.rgb24.ref.png and b/test/reference/record-replay-extend-repeat.svg.rgb24.ref.png differ
diff --git a/test/reference/recording-surface-extend-repeat.svg.argb32.ref.png b/test/reference/recording-surface-extend-repeat.svg.argb32.ref.png
new file mode 100644
index 000000000..09b04846e
Binary files /dev/null and b/test/reference/recording-surface-extend-repeat.svg.argb32.ref.png differ
diff --git a/test/reference/recording-surface-extend-repeat.svg.ref.png b/test/reference/recording-surface-extend-repeat.svg.ref.png
deleted file mode 100644
index 2938781b5..000000000
Binary files a/test/reference/recording-surface-extend-repeat.svg.ref.png and /dev/null differ
diff --git a/test/reference/recording-surface-extend-repeat.svg.rgb24.ref.png b/test/reference/recording-surface-extend-repeat.svg.rgb24.ref.png
index e04fe7e2e..ec8774986 100644
Binary files a/test/reference/recording-surface-extend-repeat.svg.rgb24.ref.png and b/test/reference/recording-surface-extend-repeat.svg.rgb24.ref.png differ
diff --git a/test/reference/self-copy-overlap.xcb.argb32.ref.png b/test/reference/self-copy-overlap.xcb.argb32.ref.png
new file mode 100644
index 000000000..bf15ed94a
Binary files /dev/null and b/test/reference/self-copy-overlap.xcb.argb32.ref.png differ
diff --git a/test/reference/self-copy-overlap.xlib.argb32.ref.png b/test/reference/self-copy-overlap.xlib.argb32.ref.png
new file mode 100644
index 000000000..bf15ed94a
Binary files /dev/null and b/test/reference/self-copy-overlap.xlib.argb32.ref.png differ
diff --git a/test/reference/self-copy.ps.ref.png b/test/reference/self-copy.ps.ref.png
new file mode 100644
index 000000000..0031d5847
Binary files /dev/null and b/test/reference/self-copy.ps.ref.png differ
diff --git a/test/reference/self-copy.ps2.ref.png b/test/reference/self-copy.ps2.ref.png
deleted file mode 100644
index 0ddf4cade..000000000
Binary files a/test/reference/self-copy.ps2.ref.png and /dev/null differ
diff --git a/test/reference/self-copy.ps3.ref.png b/test/reference/self-copy.ps3.ref.png
deleted file mode 100644
index 0ddf4cade..000000000
Binary files a/test/reference/self-copy.ps3.ref.png and /dev/null differ
diff --git a/test/reference/self-intersecting.xcb-window&.rgb24.ref.png b/test/reference/self-intersecting.xcb-window&.rgb24.ref.png
new file mode 100644
index 000000000..bc31b33e7
Binary files /dev/null and b/test/reference/self-intersecting.xcb-window&.rgb24.ref.png differ
diff --git a/test/reference/self-intersecting.xcb-window.rgb24.ref.png b/test/reference/self-intersecting.xcb-window.rgb24.ref.png
new file mode 100644
index 000000000..bc31b33e7
Binary files /dev/null and b/test/reference/self-intersecting.xcb-window.rgb24.ref.png differ
diff --git a/test/reference/self-intersecting.xcb.ref.png b/test/reference/self-intersecting.xcb.ref.png
new file mode 100644
index 000000000..bc31b33e7
Binary files /dev/null and b/test/reference/self-intersecting.xcb.ref.png differ
diff --git a/test/reference/self-intersecting.xlib-window.rgb24.ref.png b/test/reference/self-intersecting.xlib-window.rgb24.ref.png
new file mode 100644
index 000000000..bc31b33e7
Binary files /dev/null and b/test/reference/self-intersecting.xlib-window.rgb24.ref.png differ
diff --git a/test/reference/self-intersecting.xlib.ref.png b/test/reference/self-intersecting.xlib.ref.png
new file mode 100644
index 000000000..bc31b33e7
Binary files /dev/null and b/test/reference/self-intersecting.xlib.ref.png differ
diff --git a/test/reference/text-unhinted-metrics.xcb-render-0_0.ref.png b/test/reference/text-unhinted-metrics.xcb-render-0_0.ref.png
new file mode 100644
index 000000000..baf3f96ec
Binary files /dev/null and b/test/reference/text-unhinted-metrics.xcb-render-0_0.ref.png differ
diff --git a/test/reference/text-unhinted-metrics.xcb-window&.rgb24.ref.png b/test/reference/text-unhinted-metrics.xcb-window&.rgb24.ref.png
new file mode 100644
index 000000000..baf3f96ec
Binary files /dev/null and b/test/reference/text-unhinted-metrics.xcb-window&.rgb24.ref.png differ
diff --git a/test/reference/text-unhinted-metrics.xcb-window.rgb24.ref.png b/test/reference/text-unhinted-metrics.xcb-window.rgb24.ref.png
new file mode 100644
index 000000000..baf3f96ec
Binary files /dev/null and b/test/reference/text-unhinted-metrics.xcb-window.rgb24.ref.png differ
diff --git a/test/reference/user-font-color.pdf.ref.png b/test/reference/user-font-color.pdf.ref.png
deleted file mode 100644
index 5221769ca..000000000
Binary files a/test/reference/user-font-color.pdf.ref.png and /dev/null differ
diff --git a/test/reference/user-font-color.pdf.xfail.png b/test/reference/user-font-color.pdf.xfail.png
new file mode 100644
index 000000000..e3aedeb1d
Binary files /dev/null and b/test/reference/user-font-color.pdf.xfail.png differ
diff --git a/test/reference/user-font-color.script.xfail.png b/test/reference/user-font-color.script.xfail.png
index c74331eaf..5d5cdafdb 100644
Binary files a/test/reference/user-font-color.script.xfail.png and b/test/reference/user-font-color.script.xfail.png differ
diff --git a/test/reference/user-font-mask.image16.ref.png b/test/reference/user-font-mask.image16.ref.png
index 0a63ddedc..9069fc1e4 100644
Binary files a/test/reference/user-font-mask.image16.ref.png and b/test/reference/user-font-mask.image16.ref.png differ
diff --git a/test/reference/user-font-subpixel.xcb-render-0_0.ref.png b/test/reference/user-font-subpixel.xcb-render-0_0.ref.png
new file mode 100644
index 000000000..bf8d4ff4c
Binary files /dev/null and b/test/reference/user-font-subpixel.xcb-render-0_0.ref.png differ
diff --git a/test/reference/user-font-subpixel.xcb-window&.rgb24.ref.png b/test/reference/user-font-subpixel.xcb-window&.rgb24.ref.png
new file mode 100644
index 000000000..bf8d4ff4c
Binary files /dev/null and b/test/reference/user-font-subpixel.xcb-window&.rgb24.ref.png differ
diff --git a/test/reference/user-font-subpixel.xcb-window.rgb24.ref.png b/test/reference/user-font-subpixel.xcb-window.rgb24.ref.png
new file mode 100644
index 000000000..bf8d4ff4c
Binary files /dev/null and b/test/reference/user-font-subpixel.xcb-window.rgb24.ref.png differ
diff --git a/test/reference/user-font-subpixel.xcb.ref.png b/test/reference/user-font-subpixel.xcb.ref.png
new file mode 100644
index 000000000..bf8d4ff4c
Binary files /dev/null and b/test/reference/user-font-subpixel.xcb.ref.png differ

More information about the cairo-commit mailing list