From 04906075847dd5f13d9b02503032a2fbb557b32e Mon Sep 17 00:00:00 2001 From: Manuel Stoeckl Date: Wed, 25 Aug 2021 21:44:00 -0400 Subject: pdiff: convert RGB24 image values to ARGB32 on read To avoid reading a potentially garbage alpha channel when users of pdiff_compare pass in RGB24 images, if the format is RGB24, force the alpha channel to be 0xff. This commit also updates CI to adjust for the new tests that have started/stopped failing. New failures often are cases where the reference image has alpha transparency, but the test output does not; new passing tests may indicate that the unused alpha channel of an RGB24 image was garbage, but now is ignored. --- .gitlab-ci/ignore-image-argb32.txt | 1 + .gitlab-ci/ignore-image-rgb24.txt | 11 +++++++++++ .gitlab-ci/ignore-quartz-rgb24.txt | 7 +++++-- .gitlab-ci/ignore-recording-rgb24.txt | 8 ++++++++ .gitlab-ci/ignore-xcb-fallback-rgb24.txt | 6 ++++++ .gitlab-ci/ignore-xcb-render-0-0-rgb24.txt | 6 ++++++ .gitlab-ci/ignore-xcb-rgb24.txt | 4 +--- .gitlab-ci/ignore-xcb-window&-rgb24.txt | 3 +-- .gitlab-ci/ignore-xcb-window-rgb24.txt | 1 + .gitlab-ci/ignore-xlib-fallback-rgb24.txt | 4 ++++ .gitlab-ci/ignore-xlib-render-0-0-rgb24.txt | 4 ++++ .gitlab-ci/ignore-xlib-rgb24.txt | 3 --- .gitlab-ci/ignore-xlib-window-rgb24.txt | 2 -- 13 files changed, 48 insertions(+), 12 deletions(-) (limited to '.gitlab-ci') diff --git a/.gitlab-ci/ignore-image-argb32.txt b/.gitlab-ci/ignore-image-argb32.txt index 84a246f17..c5b96d732 100644 --- a/.gitlab-ci/ignore-image-argb32.txt +++ b/.gitlab-ci/ignore-image-argb32.txt @@ -18,3 +18,4 @@ text-antialias-subpixel-vrgb text-pattern text-rotate text-unhinted-metrics +user-font-mask diff --git a/.gitlab-ci/ignore-image-rgb24.txt b/.gitlab-ci/ignore-image-rgb24.txt index 2ed564551..9017df695 100644 --- a/.gitlab-ci/ignore-image-rgb24.txt +++ b/.gitlab-ci/ignore-image-rgb24.txt @@ -1,13 +1,23 @@ +bug-source-cu clip-text culled-glyphs +dash-zero-length +degenerate-path extended-blend-alpha-mask +fill-and-stroke +fill-missed-stop +finer-grained-fallbacks ft-show-glyphs-positioning ft-text-vertical-layout-type1 ft-text-vertical-layout-type3 +gradient-alpha +gradient-constant-alpha halo-transform +new-sub-path overlapping-glyphs record1414x-select-font-face record1414x-text-transform +rel-path shifted-operator show-glyphs-advance subsurface @@ -20,3 +30,4 @@ text-antialias-subpixel-vrgb text-pattern text-rotate text-unhinted-metrics +user-font-mask diff --git a/.gitlab-ci/ignore-quartz-rgb24.txt b/.gitlab-ci/ignore-quartz-rgb24.txt index d2084bd31..58d226784 100644 --- a/.gitlab-ci/ignore-quartz-rgb24.txt +++ b/.gitlab-ci/ignore-quartz-rgb24.txt @@ -2,17 +2,18 @@ bug-361 bug-431 bug-448 bug-image-compositor +bug-source-cu coverage-rhombus culled-glyphs -extended-blend extended-blend-alpha extended-blend-alpha-mask extended-blend-mask -extended-blend-solid extended-blend-solid-alpha +fill-missed-stop ft-show-glyphs-positioning ft-text-vertical-layout-type1 ft-text-vertical-layout-type3 +gradient-alpha negative-stride-image operator-www radial-gradient @@ -41,6 +42,8 @@ record-replay-extend-reflect record-replay-extend-repeat record-select-font-face record-text-transform +rel-path +set-source shifted-operator simple-edge subsurface diff --git a/.gitlab-ci/ignore-recording-rgb24.txt b/.gitlab-ci/ignore-recording-rgb24.txt index 9ad61875d..39ba6df2e 100644 --- a/.gitlab-ci/ignore-recording-rgb24.txt +++ b/.gitlab-ci/ignore-recording-rgb24.txt @@ -3,12 +3,19 @@ clear-source clip-text coverage-rectangles culled-glyphs +dash-zero-length +degenerate-path extended-blend-alpha-mask +fill-and-stroke +fill-missed-stop finer-grained-fallbacks ft-show-glyphs-positioning ft-text-vertical-layout-type1 ft-text-vertical-layout-type3 +gradient-alpha +gradient-constant-alpha halo-transform +new-sub-path overlapping-glyphs pthread-same-source record1414x-fill-alpha @@ -22,6 +29,7 @@ recording-surface-extend-reflect recording-surface-extend-repeat recording-surface-over recording-surface-source +rel-path scale-offset-similar show-glyphs-advance subsurface diff --git a/.gitlab-ci/ignore-xcb-fallback-rgb24.txt b/.gitlab-ci/ignore-xcb-fallback-rgb24.txt index 902ffa63d..9c4cd185e 100644 --- a/.gitlab-ci/ignore-xcb-fallback-rgb24.txt +++ b/.gitlab-ci/ignore-xcb-fallback-rgb24.txt @@ -1,15 +1,21 @@ clip-text coverage-intersecting-triangles culled-glyphs +dash-zero-length +degenerate-path extended-blend-alpha-mask fallback +fill-missed-stop ft-show-glyphs-positioning ft-text-vertical-layout-type1 ft-text-vertical-layout-type3 halo-transform +new-sub-path overlapping-glyphs record1414x-select-font-face record1414x-text-transform +record-replay-extend-pad +rel-path show-glyphs-advance subsurface subsurface-scale diff --git a/.gitlab-ci/ignore-xcb-render-0-0-rgb24.txt b/.gitlab-ci/ignore-xcb-render-0-0-rgb24.txt index 1578b7e9a..c2d889e19 100644 --- a/.gitlab-ci/ignore-xcb-render-0-0-rgb24.txt +++ b/.gitlab-ci/ignore-xcb-render-0-0-rgb24.txt @@ -8,11 +8,15 @@ clip-stroke-unbounded clip-twice coverage-intersecting-triangles culled-glyphs +dash-zero-length +degenerate-path extended-blend-alpha-mask fallback +fill-missed-stop ft-text-vertical-layout-type1 hatchings mask +new-sub-path operator-source radial-gradient radial-gradient-mask @@ -25,8 +29,10 @@ recording-surface-extend-none recording-surface-over record-neg-extents-bounded record-paint-alpha-solid-clip +record-replay-extend-pad record-replay-extend-reflect record-replay-extend-repeat +rel-path rotated-clip text-antialias-subpixel text-antialias-subpixel-bgr diff --git a/.gitlab-ci/ignore-xcb-rgb24.txt b/.gitlab-ci/ignore-xcb-rgb24.txt index 6baceeb65..cbb1b2d37 100644 --- a/.gitlab-ci/ignore-xcb-rgb24.txt +++ b/.gitlab-ci/ignore-xcb-rgb24.txt @@ -3,7 +3,6 @@ arc-looping-dash bug-51910 bug-84115 bug-image-compositor -bug-source-cu bug-spline caps-05 caps-1 @@ -54,8 +53,6 @@ partial-clip-text-bottom partial-clip-text-left partial-coverage-reference partial-coverage-three-quarter-reference -push-group -push-group-color radial-gradient radial-gradient-mask radial-gradient-mask-source @@ -115,6 +112,7 @@ text-antialias-subpixel-rgb text-antialias-subpixel-vbgr text-antialias-subpixel-vrgb text-glyph-range +text-pattern text-rotate text-transform tighten-bounds diff --git a/.gitlab-ci/ignore-xcb-window&-rgb24.txt b/.gitlab-ci/ignore-xcb-window&-rgb24.txt index 8f6f96d5c..10b9c9c3a 100644 --- a/.gitlab-ci/ignore-xcb-window&-rgb24.txt +++ b/.gitlab-ci/ignore-xcb-window&-rgb24.txt @@ -46,8 +46,6 @@ partial-clip-text-bottom partial-clip-text-left partial-coverage-reference partial-coverage-three-quarter-reference -push-group -push-group-color radial-outer-focus record1414x-fill-alpha record1414x-self-intersecting @@ -102,6 +100,7 @@ text-antialias-subpixel-rgb text-antialias-subpixel-vbgr text-antialias-subpixel-vrgb text-glyph-range +text-pattern text-rotate text-transform tighten-bounds diff --git a/.gitlab-ci/ignore-xcb-window-rgb24.txt b/.gitlab-ci/ignore-xcb-window-rgb24.txt index 8f6f96d5c..26df57963 100644 --- a/.gitlab-ci/ignore-xcb-window-rgb24.txt +++ b/.gitlab-ci/ignore-xcb-window-rgb24.txt @@ -102,6 +102,7 @@ text-antialias-subpixel-rgb text-antialias-subpixel-vbgr text-antialias-subpixel-vrgb text-glyph-range +text-pattern text-rotate text-transform tighten-bounds diff --git a/.gitlab-ci/ignore-xlib-fallback-rgb24.txt b/.gitlab-ci/ignore-xlib-fallback-rgb24.txt index d86d694a1..f4effb215 100644 --- a/.gitlab-ci/ignore-xlib-fallback-rgb24.txt +++ b/.gitlab-ci/ignore-xlib-fallback-rgb24.txt @@ -28,10 +28,12 @@ dash-infinite-loop dash-scale dash-zero-length degenerate-curve-to +degenerate-path degenerate-pen degenerate-rel-curve-to extended-blend-alpha-mask fallback +fill-missed-stop filter-bilinear-extents finer-grained-fallbacks font-matrix-translation @@ -52,6 +54,7 @@ line-width-tolerance long-dashed-lines mask-transformed-image mask-transformed-similar +new-sub-path operator-alpha-alpha over-above-source over-around-source @@ -71,6 +74,7 @@ recording-surface-extend-none recording-surface-over rectilinear-miter-limit reflected-stroke +rel-path select-font-face self-copy shifted-operator diff --git a/.gitlab-ci/ignore-xlib-render-0-0-rgb24.txt b/.gitlab-ci/ignore-xlib-render-0-0-rgb24.txt index a5f0ec34f..fc31fb370 100644 --- a/.gitlab-ci/ignore-xlib-render-0-0-rgb24.txt +++ b/.gitlab-ci/ignore-xlib-render-0-0-rgb24.txt @@ -7,11 +7,14 @@ clip-text coverage-intersecting-triangles culled-glyphs curve-to-as-line-to +dash-zero-length +degenerate-path extended-blend-alpha-mask fallback fill-and-stroke fill-and-stroke-alpha fill-and-stroke-alpha-add +fill-missed-stop finer-grained-fallbacks ft-show-glyphs-positioning ft-text-vertical-layout-type1 @@ -22,6 +25,7 @@ infinite-join large-twin-antialias-mixed leaky-polygon mask +new-sub-path operator-clear operator-source overlapping-glyphs diff --git a/.gitlab-ci/ignore-xlib-rgb24.txt b/.gitlab-ci/ignore-xlib-rgb24.txt index 0a4c9f616..b7b11523b 100644 --- a/.gitlab-ci/ignore-xlib-rgb24.txt +++ b/.gitlab-ci/ignore-xlib-rgb24.txt @@ -4,7 +4,6 @@ bug-51910 bug-84115 bug-extents bug-image-compositor -bug-source-cu bug-spline caps-joins-05 caps-joins-curve @@ -76,8 +75,6 @@ partial-coverage-reference partial-coverage-three-quarter-reference path-stroke-twice pthread-show-text -push-group -push-group-color radial-gradient radial-gradient-mask radial-gradient-mask-source diff --git a/.gitlab-ci/ignore-xlib-window-rgb24.txt b/.gitlab-ci/ignore-xlib-window-rgb24.txt index 814bd7da6..ac83dd920 100644 --- a/.gitlab-ci/ignore-xlib-window-rgb24.txt +++ b/.gitlab-ci/ignore-xlib-window-rgb24.txt @@ -73,8 +73,6 @@ partial-coverage-reference partial-coverage-three-quarter-reference path-stroke-twice pthread-show-text -push-group -push-group-color radial-outer-focus record1414x-fill-alpha record1414x-select-font-face -- cgit v1.2.1