From gitlab-mirror at kemper.freedesktop.org Sun Dec 2 11:02:31 2018 From: gitlab-mirror at kemper.freedesktop.org (GitLab Mirror) Date: Sun, 2 Dec 2018 11:02:31 +0000 (UTC) Subject: [cairo-commit] src/cairo-ps-surface.c src/cairo-ps-surface-private.h Message-ID: <20181202110231.6493676208@kemper.freedesktop.org> src/cairo-ps-surface-private.h | 2 ++ src/cairo-ps-surface.c | 5 +++++ 2 files changed, 7 insertions(+) New commits: commit 3c4570f8f49655735e13b35295ae3bc3ec81d027 Author: Adrian Johnson Date: Sun Dec 2 19:44:03 2018 +1030 ps: fix invalid matrix in eps embedding diff --git a/src/cairo-ps-surface-private.h b/src/cairo-ps-surface-private.h index e1681c889..f18403190 100644 --- a/src/cairo-ps-surface-private.h +++ b/src/cairo-ps-surface-private.h @@ -56,6 +56,8 @@ typedef struct _cairo_ps_form { cairo_bool_t is_image; int id; cairo_surface_t *src_surface; + cairo_rectangle_int_t src_surface_extents; + cairo_bool_t src_surface_bounded; cairo_filter_t filter; /* Union of source extents required for all operations using this form */ diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c index 0a17b81af..c4643f824 100644 --- a/src/cairo-ps-surface.c +++ b/src/cairo-ps-surface.c @@ -3548,6 +3548,8 @@ _cairo_ps_surface_use_form (cairo_ps_surface_t *surface, source_entry->unique_id = unique_id; source_entry->id = surface->num_forms++; source_entry->src_surface = cairo_surface_reference (params->src_surface); + source_entry->src_surface_extents = *params->src_surface_extents; + source_entry->src_surface_bounded = params->src_surface_bounded; source_entry->required_extents = *params->src_op_extents; source_entry->filter = params->filter; source_entry->is_image = params->is_image; @@ -3726,11 +3728,14 @@ _cairo_ps_form_emit (void *entry, void *closure) params.src_surface = form->src_surface; params.op = CAIRO_OPERATOR_OVER; + params.src_surface_extents = &form->src_surface_extents; + params.src_surface_bounded = form->src_surface_bounded; params.src_op_extents = &form->required_extents; params.filter = form->filter; params.stencil_mask = FALSE; params.is_image = form->is_image; params.approx_size = 0; + params.eod_count = 0; _cairo_output_stream_printf (surface->final_stream, "%%%%BeginResource: form cairoform-%d\n", From gitlab-mirror at kemper.freedesktop.org Sun Dec 16 08:49:05 2018 From: gitlab-mirror at kemper.freedesktop.org (GitLab Mirror) Date: Sun, 16 Dec 2018 08:49:05 +0000 (UTC) Subject: [cairo-commit] src/cairo-ft-font.c Message-ID: <20181216084905.0EBBF76149@kemper.freedesktop.org> src/cairo-ft-font.c | 10 ++++++++++ 1 file changed, 10 insertions(+) New commits: commit c0ed8ce1a111cb9472aef080ac3aa31526443f7c Author: suzuki toshiya Date: Thu Dec 13 14:36:56 2018 +0900 [cairo-ft-font.c] conditionalize the changes by 3ec4aa24 on 2018-07-16 for legacy FreeType2 without color font feature diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c index 325dd61b4..1841adb85 100644 --- a/src/cairo-ft-font.c +++ b/src/cairo-ft-font.c @@ -976,10 +976,12 @@ _compute_xrender_bitmap_size(FT_Bitmap *target, pitch = width * 4; break; +#ifdef FT_PIXEL_MODE_BGRA case FT_PIXEL_MODE_BGRA: /* each pixel is replicated into a 32-bit ARGB value */ pitch = width * 4; break; +#endif default: /* unsupported source format */ return -1; @@ -1177,10 +1179,12 @@ _fill_xrender_bitmap(FT_Bitmap *target, } break; +#ifdef FT_PIXEL_MODE_BGRA case FT_PIXEL_MODE_BGRA: for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) memcpy (dstLine, srcLine, width * 4); break; +#endif default: assert (0); @@ -1289,6 +1293,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap, component_alpha = TRUE; } break; +#ifdef FT_PIXEL_MODE_BGRA case FT_PIXEL_MODE_BGRA: stride = width * 4; if (own_buffer) { @@ -1311,6 +1316,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap, } format = CAIRO_FORMAT_ARGB32; break; +#endif case FT_PIXEL_MODE_GRAY2: case FT_PIXEL_MODE_GRAY4: convert: @@ -2487,7 +2493,9 @@ _cairo_ft_scaled_glyph_init (void *abstract_font, vertical_layout = TRUE; } +#ifdef FT_LOAD_COLOR load_flags |= FT_LOAD_COLOR; +#endif if (info & CAIRO_SCALED_GLYPH_INFO_METRICS) { @@ -2656,7 +2664,9 @@ LOAD: */ scaled_glyph_loaded = FALSE; info &= ~CAIRO_SCALED_GLYPH_INFO_METRICS; +#ifdef FT_LOAD_COLOR load_flags &= ~FT_LOAD_COLOR; +#endif goto LOAD; } From gitlab-mirror at kemper.freedesktop.org Sun Dec 16 08:53:22 2018 From: gitlab-mirror at kemper.freedesktop.org (GitLab Mirror) Date: Sun, 16 Dec 2018 08:53:22 +0000 (UTC) Subject: [cairo-commit] 2 commits - .gitlab-ci.yml test/Makefile.am Message-ID: <20181216085322.9485C76149@kemper.freedesktop.org> .gitlab-ci.yml | 2 +- test/Makefile.am | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) New commits: commit 4804d073e6e197945ffe1852f0407e4364bc71be Author: Uli Schlachter Date: Tue Nov 13 16:31:06 2018 +0100 Remove all traces of NUM_THREADS The code that looked at CAIRO_TEST_NUM_THREADS was removed seven years ago in commit 6ef9779a6f5cb8, because it was dead code. I have not managed to figure out how long exactly this code was dead already. This commit removes the last traces of NUM_THREADS. Signed-off-by: Uli Schlachter diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 96c219f29..1c65440a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ stages: script: - ./autogen.sh - - make check TARGETS=image NUM_THREADS=8 VERBOSE=1 + - make check TARGETS=image VERBOSE=1 artifacts: when: on_failure diff --git a/test/Makefile.am b/test/Makefile.am index e3c42ea88..d69012b65 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -295,13 +295,12 @@ EXTRA_PROGRAMS += $(TESTS) TARGETS = $(CAIRO_TEST_TARGET) TARGETS_EXCLUDE = $(CAIRO_TEST_TARGET_EXCLUDE) FORMAT = $(CAIRO_TEST_TARGET_FORMAT) -NUM_THREADS = $(CAIRO_TEST_NUM_THREADS) MODE = $(CAIRO_TEST_MODE) # Same about ENV vs CAIRO_TEST_ENV. ENV is used with "make run" only ENV = $(CAIRO_TEST_ENV) -TESTS_ENVIRONMENT = CAIRO_TEST_MODE="$(MODE)" CAIRO_TEST_TARGET="$(TARGETS)" CAIRO_TEST_TARGET_FORMAT="$(FORMAT)" CAIRO_TEST_TARGET_EXCLUDE="$(TARGETS_EXCLUDE)" CAIRO_TEST_NUM_THREADS="$(NUM_THREADS)" $(ENV) +TESTS_ENVIRONMENT = CAIRO_TEST_MODE="$(MODE)" CAIRO_TEST_TARGET="$(TARGETS)" CAIRO_TEST_TARGET_FORMAT="$(FORMAT)" CAIRO_TEST_TARGET_EXCLUDE="$(TARGETS_EXCLUDE)" $(ENV) EXTRA_VALGRIND_FLAGS = $(CAIRO_EXTRA_VALGRIND_FLAGS) VALGRIND_FLAGS = \ commit c62238a1dab67f05528c622047ce1e60c1a382e4 Author: Uli Schlachter Date: Tue Nov 13 16:24:19 2018 +0100 .gitlab-ci.yml: Do a verbose build With VERBOSE=1, a lot more stuff is printed while make runs. Perhaps most interestingly, this prints the output of a failed test after the test failed. Thus, this gives us the output of the test suite. Signed-off-by: Uli Schlachter diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2928eca44..96c219f29 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ stages: script: - ./autogen.sh - - make check TARGETS=image NUM_THREADS=8 + - make check TARGETS=image NUM_THREADS=8 VERBOSE=1 artifacts: when: on_failure From gitlab-mirror at kemper.freedesktop.org Mon Dec 31 02:38:00 2018 From: gitlab-mirror at kemper.freedesktop.org (GitLab Mirror) Date: Mon, 31 Dec 2018 02:38:00 +0000 (UTC) Subject: [cairo-commit] src/cairo-tag-attributes.c Message-ID: <20181231023800.62643761BE@kemper.freedesktop.org> src/cairo-tag-attributes.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) New commits: commit 3a0670e03c6a93fda764878697a78e3b966ef1f1 Author: Adrian Johnson Date: Sat Nov 24 18:36:26 2018 +1030 tag_attributes: Allow decimal points in non decimal point locales Issue #347 diff --git a/src/cairo-tag-attributes.c b/src/cairo-tag-attributes.c index 44b1147fb..f4ad501d3 100644 --- a/src/cairo-tag-attributes.c +++ b/src/cairo-tag-attributes.c @@ -217,9 +217,28 @@ static const char * parse_float (const char *p, double *d) { int n; + const char *start = p; + cairo_bool_t has_decimal_point = FALSE; - if (sscanf(p, "%lf%n", d, &n) > 0) - return p + n; + while (*p) { + if (*p == '.' || *p == ']' || _cairo_isspace (*p)) + break; + p++; + } + + if (*p == '.') + has_decimal_point = TRUE; + + if (has_decimal_point) { + char *end; + *d = _cairo_strtod (start, &end); + if (end) + return end; + + } else { + if (sscanf(start, "%lf%n", d, &n) > 0) + return start + n; + } return NULL; }