[cairo-commit] 5 commits - src/cairo-analysis-surface.c test/extended-blend.c test/reference
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Sep 6 00:00:56 UTC 2018
src/cairo-analysis-surface.c | 7 ++++---
test/extended-blend.c | 3 ---
test/reference/clip-operator.argb32.ref.png |binary
test/reference/clip-operator.rgb24.ref.png |binary
test/reference/clip-text.ref.png |binary
test/reference/coverage-rhombus.ref.png |binary
test/reference/extended-blend-alpha.argb32.ref.png |binary
test/reference/extended-blend-alpha.rgb24.ref.png |binary
test/reference/extended-blend-mask.argb32.ref.png |binary
test/reference/extended-blend-mask.rgb24.ref.png |binary
test/reference/extended-blend-solid-alpha.argb32.ref.png |binary
test/reference/extended-blend-solid-alpha.rgb24.ref.png |binary
test/reference/extended-blend-solid.rgb24.ref.png |binary
test/reference/extended-blend.rgb24.ref.png |binary
test/reference/fallback.argb32.ref.png |binary
test/reference/fallback.rgb24.ref.png |binary
test/reference/ft-text-antialias-none.ref.png |binary
test/reference/halo-transform.ref.png |binary
test/reference/halo.ref.png |binary
test/reference/operator-clear.argb32.ref.png |binary
test/reference/operator-clear.rgb24.ref.png |binary
test/reference/operator-source.argb32.ref.png |binary
test/reference/operator-source.rgb24.ref.png |binary
test/reference/pthread-show-text.ref.png |binary
test/reference/radial-gradient-mask-source.argb32.ref.png |binary
test/reference/radial-gradient-mask-source.rgb24.ref.png |binary
test/reference/radial-gradient-source.ref.png |binary
test/reference/radial-gradient.ref.png |binary
test/reference/record-select-font-face.ref.png |binary
test/reference/record-text-transform.ref.png |binary
test/reference/record1414x-select-font-face.ref.png |binary
test/reference/record1414x-text-transform.ref.png |binary
test/reference/record2x-select-font-face.ref.png |binary
test/reference/record2x-text-transform.ref.png |binary
test/reference/record90-select-font-face.ref.png |binary
test/reference/record90-text-transform.ref.png |binary
test/reference/recordflip-select-font-face.ref.png |binary
test/reference/recordflip-text-transform.ref.png |binary
test/reference/recordflip-whole-select-font-face.ref.png |binary
test/reference/recordflip-whole-text-transform.ref.png |binary
test/reference/smask-text.ref.png |binary
test/reference/smask.ref.png |binary
test/reference/text-antialias-subpixel-bgr.ref.png |binary
test/reference/text-antialias-subpixel-rgb.ref.png |binary
test/reference/text-antialias-subpixel-vbgr.ref.png |binary
test/reference/text-antialias-subpixel-vrgb.ref.png |binary
test/reference/text-antialias-subpixel.ref.png |binary
test/reference/text-pattern.ref.png |binary
test/reference/text-unhinted-metrics.ref.png |binary
test/reference/unbounded-operator.argb32.ref.png |binary
test/reference/unbounded-operator.rgb24.ref.png |binary
test/reference/user-font-proxy.ref.png |binary
test/reference/user-font-rescale.ref.png |binary
53 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 2b1f096145d00fdeb5e0f4990408205350460130
Author: Federico Mena Quintero <federico at gnome.org>
Date: Thu Mar 8 17:50:43 2018 -0600
Normalize test reference images with minor text rendering differences
[In testing, I was able to reproduce Federico's results for most, but
not all, of the test images. There might be some additional
platform-specific discrepancies that need ironed out, but this is a
solid step forward in any case.
Results for a quick run against just the image backend on my system:
--bryce]
Signed-off-by: Bryce Harrington <bryce at bryceharrington.org>
Bryce Harrington <bryce at bryceharrington.org>
Signed-off-by: Bryce Harrington <b.harrington at samsung.com>
diff --git a/test/reference/clip-text.ref.png b/test/reference/clip-text.ref.png
index c73d1fd35..8950caa58 100644
Binary files a/test/reference/clip-text.ref.png and b/test/reference/clip-text.ref.png differ
diff --git a/test/reference/ft-text-antialias-none.ref.png b/test/reference/ft-text-antialias-none.ref.png
index cb0c13222..bae5d9534 100644
Binary files a/test/reference/ft-text-antialias-none.ref.png and b/test/reference/ft-text-antialias-none.ref.png differ
diff --git a/test/reference/halo-transform.ref.png b/test/reference/halo-transform.ref.png
index f549c0dc2..07abc4211 100644
Binary files a/test/reference/halo-transform.ref.png and b/test/reference/halo-transform.ref.png differ
diff --git a/test/reference/halo.ref.png b/test/reference/halo.ref.png
index dc1316d5b..a393199f3 100644
Binary files a/test/reference/halo.ref.png and b/test/reference/halo.ref.png differ
diff --git a/test/reference/operator-clear.argb32.ref.png b/test/reference/operator-clear.argb32.ref.png
index 2ce556e7c..371cc2733 100644
Binary files a/test/reference/operator-clear.argb32.ref.png and b/test/reference/operator-clear.argb32.ref.png differ
diff --git a/test/reference/operator-clear.rgb24.ref.png b/test/reference/operator-clear.rgb24.ref.png
index 1e89ccdfb..f6b1b334e 100644
Binary files a/test/reference/operator-clear.rgb24.ref.png and b/test/reference/operator-clear.rgb24.ref.png differ
diff --git a/test/reference/operator-source.argb32.ref.png b/test/reference/operator-source.argb32.ref.png
index 49d2f270e..146e541a4 100644
Binary files a/test/reference/operator-source.argb32.ref.png and b/test/reference/operator-source.argb32.ref.png differ
diff --git a/test/reference/operator-source.rgb24.ref.png b/test/reference/operator-source.rgb24.ref.png
index 38472f4ea..52fdd3b5b 100644
Binary files a/test/reference/operator-source.rgb24.ref.png and b/test/reference/operator-source.rgb24.ref.png differ
diff --git a/test/reference/pthread-show-text.ref.png b/test/reference/pthread-show-text.ref.png
index 90d0af349..8687f180f 100644
Binary files a/test/reference/pthread-show-text.ref.png and b/test/reference/pthread-show-text.ref.png differ
diff --git a/test/reference/record-select-font-face.ref.png b/test/reference/record-select-font-face.ref.png
index 63c7cca8a..1cd8dd9e6 100644
Binary files a/test/reference/record-select-font-face.ref.png and b/test/reference/record-select-font-face.ref.png differ
diff --git a/test/reference/record-text-transform.ref.png b/test/reference/record-text-transform.ref.png
index 8e74785f5..d26c3a30d 100644
Binary files a/test/reference/record-text-transform.ref.png and b/test/reference/record-text-transform.ref.png differ
diff --git a/test/reference/record1414x-select-font-face.ref.png b/test/reference/record1414x-select-font-face.ref.png
index ac30b23a3..63c3b4da4 100644
Binary files a/test/reference/record1414x-select-font-face.ref.png and b/test/reference/record1414x-select-font-face.ref.png differ
diff --git a/test/reference/record1414x-text-transform.ref.png b/test/reference/record1414x-text-transform.ref.png
index ef3c96726..e12894962 100644
Binary files a/test/reference/record1414x-text-transform.ref.png and b/test/reference/record1414x-text-transform.ref.png differ
diff --git a/test/reference/record2x-select-font-face.ref.png b/test/reference/record2x-select-font-face.ref.png
index 32c1367fb..12b75a69e 100644
Binary files a/test/reference/record2x-select-font-face.ref.png and b/test/reference/record2x-select-font-face.ref.png differ
diff --git a/test/reference/record2x-text-transform.ref.png b/test/reference/record2x-text-transform.ref.png
index ff521ab8a..965d67400 100644
Binary files a/test/reference/record2x-text-transform.ref.png and b/test/reference/record2x-text-transform.ref.png differ
diff --git a/test/reference/record90-select-font-face.ref.png b/test/reference/record90-select-font-face.ref.png
index 13ed998f2..382f6c2b9 100644
Binary files a/test/reference/record90-select-font-face.ref.png and b/test/reference/record90-select-font-face.ref.png differ
diff --git a/test/reference/record90-text-transform.ref.png b/test/reference/record90-text-transform.ref.png
index e8fa7225f..7f061ddef 100644
Binary files a/test/reference/record90-text-transform.ref.png and b/test/reference/record90-text-transform.ref.png differ
diff --git a/test/reference/recordflip-select-font-face.ref.png b/test/reference/recordflip-select-font-face.ref.png
index bedb1ca20..25b4a7e60 100644
Binary files a/test/reference/recordflip-select-font-face.ref.png and b/test/reference/recordflip-select-font-face.ref.png differ
diff --git a/test/reference/recordflip-text-transform.ref.png b/test/reference/recordflip-text-transform.ref.png
index ccf5e3367..0b7bb0df8 100644
Binary files a/test/reference/recordflip-text-transform.ref.png and b/test/reference/recordflip-text-transform.ref.png differ
diff --git a/test/reference/recordflip-whole-select-font-face.ref.png b/test/reference/recordflip-whole-select-font-face.ref.png
index bedb1ca20..25b4a7e60 100644
Binary files a/test/reference/recordflip-whole-select-font-face.ref.png and b/test/reference/recordflip-whole-select-font-face.ref.png differ
diff --git a/test/reference/recordflip-whole-text-transform.ref.png b/test/reference/recordflip-whole-text-transform.ref.png
index ccf5e3367..0b7bb0df8 100644
Binary files a/test/reference/recordflip-whole-text-transform.ref.png and b/test/reference/recordflip-whole-text-transform.ref.png differ
diff --git a/test/reference/smask-text.ref.png b/test/reference/smask-text.ref.png
index 66ef289ca..f263225fb 100644
Binary files a/test/reference/smask-text.ref.png and b/test/reference/smask-text.ref.png differ
diff --git a/test/reference/smask.ref.png b/test/reference/smask.ref.png
index d49e8f5a1..d2a9b1252 100644
Binary files a/test/reference/smask.ref.png and b/test/reference/smask.ref.png differ
diff --git a/test/reference/text-antialias-subpixel-bgr.ref.png b/test/reference/text-antialias-subpixel-bgr.ref.png
index c36218295..65d972c6b 100644
Binary files a/test/reference/text-antialias-subpixel-bgr.ref.png and b/test/reference/text-antialias-subpixel-bgr.ref.png differ
diff --git a/test/reference/text-antialias-subpixel-rgb.ref.png b/test/reference/text-antialias-subpixel-rgb.ref.png
index 0cbf3f1f2..83ec4f8f0 100644
Binary files a/test/reference/text-antialias-subpixel-rgb.ref.png and b/test/reference/text-antialias-subpixel-rgb.ref.png differ
diff --git a/test/reference/text-antialias-subpixel-vbgr.ref.png b/test/reference/text-antialias-subpixel-vbgr.ref.png
index 7c89df9ea..b0c189cb8 100644
Binary files a/test/reference/text-antialias-subpixel-vbgr.ref.png and b/test/reference/text-antialias-subpixel-vbgr.ref.png differ
diff --git a/test/reference/text-antialias-subpixel-vrgb.ref.png b/test/reference/text-antialias-subpixel-vrgb.ref.png
index 103c7e416..2d50d1dd4 100644
Binary files a/test/reference/text-antialias-subpixel-vrgb.ref.png and b/test/reference/text-antialias-subpixel-vrgb.ref.png differ
diff --git a/test/reference/text-antialias-subpixel.ref.png b/test/reference/text-antialias-subpixel.ref.png
index 0cbf3f1f2..83ec4f8f0 100644
Binary files a/test/reference/text-antialias-subpixel.ref.png and b/test/reference/text-antialias-subpixel.ref.png differ
diff --git a/test/reference/text-pattern.ref.png b/test/reference/text-pattern.ref.png
index 95410fa2b..c5a925c95 100644
Binary files a/test/reference/text-pattern.ref.png and b/test/reference/text-pattern.ref.png differ
diff --git a/test/reference/text-unhinted-metrics.ref.png b/test/reference/text-unhinted-metrics.ref.png
index 7bfe2f651..f7b166500 100644
Binary files a/test/reference/text-unhinted-metrics.ref.png and b/test/reference/text-unhinted-metrics.ref.png differ
diff --git a/test/reference/unbounded-operator.argb32.ref.png b/test/reference/unbounded-operator.argb32.ref.png
index 0b4338865..8dbeef0e8 100644
Binary files a/test/reference/unbounded-operator.argb32.ref.png and b/test/reference/unbounded-operator.argb32.ref.png differ
diff --git a/test/reference/unbounded-operator.rgb24.ref.png b/test/reference/unbounded-operator.rgb24.ref.png
index 1a1f9d1a7..825d2faa9 100644
Binary files a/test/reference/unbounded-operator.rgb24.ref.png and b/test/reference/unbounded-operator.rgb24.ref.png differ
diff --git a/test/reference/user-font-proxy.ref.png b/test/reference/user-font-proxy.ref.png
index aa4f2556a..95c04633f 100644
Binary files a/test/reference/user-font-proxy.ref.png and b/test/reference/user-font-proxy.ref.png differ
diff --git a/test/reference/user-font-rescale.ref.png b/test/reference/user-font-rescale.ref.png
index 093906014..f2d71680f 100644
Binary files a/test/reference/user-font-rescale.ref.png and b/test/reference/user-font-rescale.ref.png differ
commit fb24d7b737e80ed684bd8c9f4dea5e3c50d778e9
Author: Federico Mena Quintero <federico at gnome.org>
Date: Thu Mar 8 18:23:47 2018 -0600
Normalize test images with minor gradient differences
Signed-off-by: Bryce Harrington <bryce at bryceharrington.org>
Bryce Harrington <bryce at bryceharrington.org>
Signed-off-by: Bryce Harrington <b.harrington at samsung.com>
diff --git a/test/reference/clip-operator.argb32.ref.png b/test/reference/clip-operator.argb32.ref.png
index d041a2f6b..e27de20a4 100644
Binary files a/test/reference/clip-operator.argb32.ref.png and b/test/reference/clip-operator.argb32.ref.png differ
diff --git a/test/reference/clip-operator.rgb24.ref.png b/test/reference/clip-operator.rgb24.ref.png
index c36907279..8d6a27d9e 100644
Binary files a/test/reference/clip-operator.rgb24.ref.png and b/test/reference/clip-operator.rgb24.ref.png differ
diff --git a/test/reference/coverage-rhombus.ref.png b/test/reference/coverage-rhombus.ref.png
index 51e08353e..3d3c031cf 100644
Binary files a/test/reference/coverage-rhombus.ref.png and b/test/reference/coverage-rhombus.ref.png differ
diff --git a/test/reference/extended-blend-alpha.argb32.ref.png b/test/reference/extended-blend-alpha.argb32.ref.png
index 4d56a21fc..9731b681b 100644
Binary files a/test/reference/extended-blend-alpha.argb32.ref.png and b/test/reference/extended-blend-alpha.argb32.ref.png differ
diff --git a/test/reference/extended-blend-alpha.rgb24.ref.png b/test/reference/extended-blend-alpha.rgb24.ref.png
index 86d0e2d91..cbffb70cb 100644
Binary files a/test/reference/extended-blend-alpha.rgb24.ref.png and b/test/reference/extended-blend-alpha.rgb24.ref.png differ
diff --git a/test/reference/extended-blend-solid-alpha.argb32.ref.png b/test/reference/extended-blend-solid-alpha.argb32.ref.png
index 4d56a21fc..9731b681b 100644
Binary files a/test/reference/extended-blend-solid-alpha.argb32.ref.png and b/test/reference/extended-blend-solid-alpha.argb32.ref.png differ
diff --git a/test/reference/extended-blend-solid-alpha.rgb24.ref.png b/test/reference/extended-blend-solid-alpha.rgb24.ref.png
index 86d0e2d91..cbffb70cb 100644
Binary files a/test/reference/extended-blend-solid-alpha.rgb24.ref.png and b/test/reference/extended-blend-solid-alpha.rgb24.ref.png differ
diff --git a/test/reference/extended-blend-solid.rgb24.ref.png b/test/reference/extended-blend-solid.rgb24.ref.png
index cdcb6ad11..7d85c93ef 100644
Binary files a/test/reference/extended-blend-solid.rgb24.ref.png and b/test/reference/extended-blend-solid.rgb24.ref.png differ
diff --git a/test/reference/extended-blend.rgb24.ref.png b/test/reference/extended-blend.rgb24.ref.png
index cdcb6ad11..7d85c93ef 100644
Binary files a/test/reference/extended-blend.rgb24.ref.png and b/test/reference/extended-blend.rgb24.ref.png differ
diff --git a/test/reference/fallback.argb32.ref.png b/test/reference/fallback.argb32.ref.png
index b96e90af6..ac8592ea9 100644
Binary files a/test/reference/fallback.argb32.ref.png and b/test/reference/fallback.argb32.ref.png differ
diff --git a/test/reference/fallback.rgb24.ref.png b/test/reference/fallback.rgb24.ref.png
index 3f9213219..3b944244a 100644
Binary files a/test/reference/fallback.rgb24.ref.png and b/test/reference/fallback.rgb24.ref.png differ
diff --git a/test/reference/radial-gradient-mask-source.argb32.ref.png b/test/reference/radial-gradient-mask-source.argb32.ref.png
index 2bf65b3d6..8e41bcfee 100644
Binary files a/test/reference/radial-gradient-mask-source.argb32.ref.png and b/test/reference/radial-gradient-mask-source.argb32.ref.png differ
diff --git a/test/reference/radial-gradient-mask-source.rgb24.ref.png b/test/reference/radial-gradient-mask-source.rgb24.ref.png
index 55335196a..ddf247808 100644
Binary files a/test/reference/radial-gradient-mask-source.rgb24.ref.png and b/test/reference/radial-gradient-mask-source.rgb24.ref.png differ
diff --git a/test/reference/radial-gradient-source.ref.png b/test/reference/radial-gradient-source.ref.png
index 4ab4796fa..c5c494966 100644
Binary files a/test/reference/radial-gradient-source.ref.png and b/test/reference/radial-gradient-source.ref.png differ
diff --git a/test/reference/radial-gradient.ref.png b/test/reference/radial-gradient.ref.png
index a2cbbc82e..81e3a0e20 100644
Binary files a/test/reference/radial-gradient.ref.png and b/test/reference/radial-gradient.ref.png differ
commit cfc90ca91e1cd506bf6176b9db2cbcd4323bfd1a
Author: Federico Mena Quintero <federico at gnome.org>
Date: Thu Mar 8 15:44:40 2018 -0600
Normalize extended-blend-mask.{argb32,rgb24}.ref.png
I don't see how the old reference file could have been generated.
Things I tried:
* Using an old pixman (but it seems that the relevant code for Adobe
extended blend modes has not changed?)
* Using the Cairo version where the test was first introduced.
* Changing the alpha value from .5 to something else.
Signed-off-by: Bryce Harrington <bryce at bryceharrington.org>
Tested-by: Bryce Harrington <bryce at bryceharrington.org>
Signed-off-by: Bryce Harrington <b.harrington at samsung.com>
diff --git a/test/reference/extended-blend-mask.argb32.ref.png b/test/reference/extended-blend-mask.argb32.ref.png
index 79a6e5380..59b684d25 100644
Binary files a/test/reference/extended-blend-mask.argb32.ref.png and b/test/reference/extended-blend-mask.argb32.ref.png differ
diff --git a/test/reference/extended-blend-mask.rgb24.ref.png b/test/reference/extended-blend-mask.rgb24.ref.png
index 400df6a20..8199321d2 100644
Binary files a/test/reference/extended-blend-mask.rgb24.ref.png and b/test/reference/extended-blend-mask.rgb24.ref.png differ
commit 78a5d543b65491bb34094235364fead82904d54d
Author: Federico Mena Quintero <federico at gnome.org>
Date: Thu Mar 8 13:27:38 2018 -0600
test/extended-blend.c: Remove obsolete comments about buggy librsvg
The comment said that using CAIRO_OPERATOR_SOURCE for the background
triggered a librsvg bug, but the relevant commit message does not even
include a link to a librsvg bug.
Also, changing it from OVER to SOURCE completely breaks these
tests (the reference images don't match at all), so this comment is
stale. Just remove it.
Signed-off-by: Bryce Harrington <b.harrington at samsung.com>
diff --git a/test/extended-blend.c b/test/extended-blend.c
index 8edd182d6..9c6f07d7d 100644
--- a/test/extended-blend.c
+++ b/test/extended-blend.c
@@ -71,7 +71,6 @@ do_blend_solid (cairo_t *cr, cairo_operator_t op, cairo_bool_t alpha)
cairo_save (cr);
cairo_scale (cr, SIZE, SIZE);
- /* not using CAIRO_OPERATOR_SOURCE here, it triggers a librsvg bug */
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
for (x = 0; x < STEPS; x++) {
/* draw the background using discrete steps */
@@ -126,7 +125,6 @@ do_blend (cairo_t *cr, cairo_operator_t op, cairo_bool_t alpha)
create_patterns (cr, &bg, &fg, alpha);
- /* not using CAIRO_OPERATOR_SOURCE here, it triggers a librsvg bug */
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
cairo_set_source_surface (cr, bg, 0, 0);
cairo_paint (cr);
@@ -146,7 +144,6 @@ do_blend_mask (cairo_t *cr, cairo_operator_t op, cairo_bool_t alpha)
create_patterns (cr, &bg, &fg, alpha);
- /* not using CAIRO_OPERATOR_SOURCE here, it triggers a librsvg bug */
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
cairo_set_source_surface (cr, bg, 0, 0);
cairo_paint (cr);
commit 38fc475995afade7edfe43af4bea6345ab989ea5
Author: Federico Mena Quintero <federico at gnome.org>
Date: Tue Feb 27 17:44:03 2018 -0600
cairo-analysis-surface: Quell invalid uninitialized variable warning
Signed-off-by: Bryce Harrington <b.harrington at samsung.com>
diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c
index 6ee13a92e..c4f9a6d35 100644
--- a/src/cairo-analysis-surface.c
+++ b/src/cairo-analysis-surface.c
@@ -263,7 +263,8 @@ _analyze_recording_surface_pattern (cairo_analysis_surface_t *surface,
cairo_analysis_surface_t *tmp;
cairo_surface_t *source, *proxy;
cairo_matrix_t p2d;
- cairo_int_status_t status, analysis_status;
+ cairo_int_status_t status;
+ cairo_int_status_t analysis_status = CAIRO_INT_STATUS_SUCCESS;
cairo_bool_t surface_is_unbounded;
cairo_bool_t unused;
@@ -347,8 +348,8 @@ _analyze_recording_surface_pattern (cairo_analysis_surface_t *surface,
if (unlikely (status))
return status;
-
- return analysis_status;
+ else
+ return analysis_status;
}
static cairo_status_t
More information about the cairo-commit
mailing list