[cairo-commit] 2 commits - .gitlab-ci/ignore-image16-rgb24.txt .gitlab-ci/ignore-image-rgb24.txt test/reference

[GitLab Mirror]

 .gitlab-ci/ignore-image-rgb24.txt          |    1 -
 .gitlab-ci/ignore-image16-rgb24.txt        |    1 -
 test/reference/alpha-similar.rgb24.ref.png |binary
 3 files changed, 2 deletions(-)

New commits:
commit 21d7198befcf57240b2c0f7996e9741807ac4061
Merge: 913645462 63973958b
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun May 29 05:29:57 2022 +0000

    Merge branch 'fix-rgb24-tests' into 'master'
    
    Fix clip-unbounded and alpha-similar in CI
    
    See merge request cairo/cairo!301

commit 63973958bce79dc212f66f8b2dfe45e6bdf394f0
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun Mar 13 16:14:48 2022 +0100

    Add an rgb24 ref image for alpha similar
    
    This commit copies the current alpha-similar.image.rgb24.out.png to
    alpha-similar.rgb24.ref.png to make the test pass.
    
    This failure goes back to commits 6647511 / 049060 which changed the
    image comparison in the test suite. Previously, transparent "nothing"
    and black compared equal, but said commits fixed that. Thus, having a
    special reference image with black instead of transparency is the right
    fix.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/.gitlab-ci/ignore-image-rgb24.txt b/.gitlab-ci/ignore-image-rgb24.txt
index 956b4ebf3..3c90818b9 100644
--- a/.gitlab-ci/ignore-image-rgb24.txt
+++ b/.gitlab-ci/ignore-image-rgb24.txt
@@ -1,5 +1,4 @@
 a1-clip-fill-rule
-alpha-similar
 big-empty-box
 big-empty-triangle
 big-little-box
diff --git a/.gitlab-ci/ignore-image16-rgb24.txt b/.gitlab-ci/ignore-image16-rgb24.txt
index b1cd62495..418275a30 100644
--- a/.gitlab-ci/ignore-image16-rgb24.txt
+++ b/.gitlab-ci/ignore-image16-rgb24.txt
@@ -2,7 +2,6 @@ a1-bug
 a1-clip-fill-rule
 a1-tiger
 aliasing
-alpha-similar
 arc-direction
 arc-looping-dash
 big-empty-box
diff --git a/test/reference/alpha-similar.rgb24.ref.png b/test/reference/alpha-similar.rgb24.ref.png
new file mode 100644
index 000000000..a1f5280a4
Binary files /dev/null and b/test/reference/alpha-similar.rgb24.ref.png differ