From 040f82bb2bc68797473ae3cae41b16c2cf4f2ad6 Mon Sep 17 00:00:00 2001 From: Doug Felt Date: Sun, 23 Apr 2017 20:31:11 -0700 Subject: [PATCH 1/3] Update version. --- NotoColorEmoji.tmpl.ttx.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NotoColorEmoji.tmpl.ttx.tmpl b/NotoColorEmoji.tmpl.ttx.tmpl index ec95302dd..5e3b47509 100644 --- a/NotoColorEmoji.tmpl.ttx.tmpl +++ b/NotoColorEmoji.tmpl.ttx.tmpl @@ -78,7 +78,7 @@ - + @@ -246,7 +246,7 @@ Noto Color Emoji - Version 1.33 + Version 1.37 NotoColorEmoji From 46418225ffcb80dd53069e43c1081f0e1538fcc0 Mon Sep 17 00:00:00 2001 From: Doug Felt Date: Thu, 27 Apr 2017 15:02:41 -0700 Subject: [PATCH 2/3] Quiet warning caused by const argument to basename. The cases in which this warning is legitimate are failing cases for us anyway, so just cast away const to silence this warning. --- waveflag.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/waveflag.c b/waveflag.c index 605b9b1a7..3c234e0af 100644 --- a/waveflag.c +++ b/waveflag.c @@ -409,7 +409,12 @@ wave_flag (const char *filename, const char *out_prefix) *out = '\0'; strcat (out, out_prefix); // diff from upstream. we call this a bit differently, filename might not be in cwd. - strcat (out, basename(filename)); + + // basename wants a non-const argument. The problem here is paths that end in a + // slash, POSIX basename removes them while GNU just returns a pointer to that + // slash. Since this is supposed to be a filename such input is illegal for us. + // We're already not checking for overflow of the output buffer anyway... + strcat (out, basename((char *) filename)); cairo_surface_write_to_png (cairo_get_target (cr), out); cairo_destroy (cr); From 3ae82ce23db05cb7e1f146823316d316ec360791 Mon Sep 17 00:00:00 2001 From: Doug Felt Date: Thu, 27 Apr 2017 15:06:55 -0700 Subject: [PATCH 3/3] Equally lighten and darken flags. Apply patch from upstream 9c4f5f11802c 'Adjust shadow to equally darken and lighten'. The waved flags were noticeably darker than the source image, for example the blue of the Russian flag was too dark. --- waveflag.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/waveflag.c b/waveflag.c index 3c234e0af..7d04c13b2 100644 --- a/waveflag.c +++ b/waveflag.c @@ -98,10 +98,10 @@ wave_mesh_create (double aspect, int alpha) if (alpha) { - cairo_mesh_pattern_set_corner_color_rgba(pattern, 0, 0, 0, 0, 0); - cairo_mesh_pattern_set_corner_color_rgba(pattern, 1, 0, 0, 0, .5); - cairo_mesh_pattern_set_corner_color_rgba(pattern, 2, 0, 0, 0, 1); - cairo_mesh_pattern_set_corner_color_rgba(pattern, 3, 0, 0, 0, .5); + cairo_mesh_pattern_set_corner_color_rgba(pattern, 0, 1, 1, 1, .5); + cairo_mesh_pattern_set_corner_color_rgba(pattern, 1,.5,.5,.5, .5); + cairo_mesh_pattern_set_corner_color_rgba(pattern, 2, 0, 0, 0, .5); + cairo_mesh_pattern_set_corner_color_rgba(pattern, 3,.5,.5,.5, .5); } else {