From 6647511593ce0ab1de3dbd514796e926e232d644 Mon Sep 17 00:00:00 2001 From: Manuel Stoeckl Date: Wed, 25 Aug 2021 21:08:36 -0400 Subject: test: explicitly handle image formats in buffer_diff_core In practice, the A and B images may be any mixture of RGB24 and ARGB32 formats, so this change accepts all combinations of these types, and converts the pixel values to a common (ARGB32) format as needed. Some of the newly added test failures are cases where the image output is RGB24, but the matching reference image is ARGB32 with noticeable transparency. Some of the newly passing tests are cases where the unused 'alpha' channel of an RGB24 image was not equal to 0xff, and the previous code had incorrectly used this channel in max_diff calculations. --- .gitlab-ci/ignore-recording-rgb24.txt | 42 +++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to '.gitlab-ci/ignore-recording-rgb24.txt') diff --git a/.gitlab-ci/ignore-recording-rgb24.txt b/.gitlab-ci/ignore-recording-rgb24.txt index 39ba6df2e..90eb1d5fe 100644 --- a/.gitlab-ci/ignore-recording-rgb24.txt +++ b/.gitlab-ci/ignore-recording-rgb24.txt @@ -1,23 +1,52 @@ +a1-clip-fill-rule +alpha-similar +big-empty-box +big-empty-triangle +big-little-box +bitmap-font +bug-361 +bug-431 bug-source-cu clear-source +clip-device-offset +clip-fill-rule-pixel-aligned clip-text +clip-unbounded coverage-rectangles culled-glyphs dash-zero-length degenerate-path +device-offset +device-offset-positive extended-blend-alpha-mask fill-and-stroke +fill-empty fill-missed-stop finer-grained-fallbacks +ft-color-font ft-show-glyphs-positioning ft-text-vertical-layout-type1 ft-text-vertical-layout-type3 gradient-alpha gradient-constant-alpha +gradient-zero-stops +gradient-zero-stops-mask halo-transform +image-surface-source +linear-gradient-one-stop +mask-ctm +mask-surface-ctm new-sub-path +nil-surface +overlapping-boxes overlapping-glyphs +pass-through +pdf-surface-source +pixman-downscale-best-24 +pixman-rotate +ps-surface-source pthread-same-source +radial-gradient-source record1414x-fill-alpha record1414x-select-font-face record1414x-text-transform @@ -29,10 +58,20 @@ recording-surface-extend-reflect recording-surface-extend-repeat recording-surface-over recording-surface-source +record-neg-extents-bounded +record-neg-extents-unbounded +record-replay-extend-none +record-replay-extend-pad +record-replay-extend-reflect +record-replay-extend-repeat rel-path scale-offset-similar +scale-source-surface-paint +set-source show-glyphs-advance +source-surface-scale-paint subsurface +subsurface-outside-target subsurface-scale text-antialias-subpixel text-antialias-subpixel-bgr @@ -42,3 +81,6 @@ text-antialias-subpixel-vrgb text-pattern text-rotate text-unhinted-metrics +thin-lines +xcb-surface-source +xlib-surface-source -- cgit v1.2.1