diff options
| author | Adrian Johnson <ajohnson@redneon.com> | 2023-02-03 20:47:16 +0000 |
|---|---|---|
| committer | Adrian Johnson <ajohnson@redneon.com> | 2023-02-03 20:47:16 +0000 |
| commit | 338eca43428d1956216362eeb8e1715bac99d876 (patch) | |
| tree | e0eb875c8973728ec84f75b799903d6dc30403fe /util | |
| parent | 71eb6396c497541118d4c85f97cb9d05aeb94a7e (diff) | |
| parent | 4b1e0751716a2a8ff74bb01be8ec3735039fe2e5 (diff) | |
| download | cairo-338eca43428d1956216362eeb8e1715bac99d876.tar.gz | |
Merge branch 'issue-634' into 'master'
tee: Fix cairo wrapper functions
Closes #634
See merge request cairo/cairo!442
Diffstat (limited to 'util')
| -rw-r--r-- | util/cairo-sphinx/sphinx.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/util/cairo-sphinx/sphinx.c b/util/cairo-sphinx/sphinx.c index 9e248aff1..741e406d6 100644 --- a/util/cairo-sphinx/sphinx.c +++ b/util/cairo-sphinx/sphinx.c @@ -559,7 +559,8 @@ compare_images (cairo_surface_t *a, int channel; for (channel = 0; channel < 4; channel++) { - unsigned va, vb, diff; + int va, vb; + unsigned diff; va = (ua[x] >> (channel*8)) & 0xff; vb = (ub[x] >> (channel*8)) & 0xff; @@ -588,7 +589,8 @@ compare_images (cairo_surface_t *a, int channel; for (channel = 0; channel < 3; channel++) { - unsigned va, vb, diff; + int va, vb; + unsigned diff; va = (ua[x] >> (channel*8)) & 0xff; vb = (ub[x] >> (channel*8)) & 0xff; @@ -614,7 +616,7 @@ compare_images (cairo_surface_t *a, if (aa[x] != bb[x]) { unsigned diff = abs (aa[x] - bb[x]); if (diff > 1) { - uint8_t va, vb; + int8_t va, vb; va = get_median_8 (x, y, aa, width, height, stride); vb = get_median_8 (x, y, bb, width, height, stride); @@ -642,6 +644,9 @@ compare_images (cairo_surface_t *a, case CAIRO_FORMAT_INVALID: case CAIRO_FORMAT_RGB16_565: /* XXX */ + case CAIRO_FORMAT_RGB30: + case CAIRO_FORMAT_RGB96F: + case CAIRO_FORMAT_RGBA128F: break; } |