From 09347d9cc6722a4a58aee45da457c4374d5c4437 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Mon, 6 May 2024 19:26:21 -0500 Subject: [PATCH] Issue #2512 - Part 3 - Fix new failures with GCC 14. --- gfx/cairo/cairo/src/cairo-ft-font.c | 2 +- gfx/cairo/cairo/src/cairo-surface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/cairo/cairo/src/cairo-ft-font.c b/gfx/cairo/cairo/src/cairo-ft-font.c index a2259c173a..bf2a8e9d2c 100644 --- a/gfx/cairo/cairo/src/cairo-ft-font.c +++ b/gfx/cairo/cairo/src/cairo-ft-font.c @@ -1578,7 +1578,7 @@ _transform_glyph_bitmap (cairo_matrix_t * shape, if (unlikely (status)) return status; - if (cairo_image_surface_get_format (*surface) == CAIRO_FORMAT_ARGB32 && + if (cairo_image_surface_get_format ((cairo_surface_t *)*surface) == CAIRO_FORMAT_ARGB32 && !pixman_image_get_component_alpha ((*surface)->pixman_image)) image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); else diff --git a/gfx/cairo/cairo/src/cairo-surface.c b/gfx/cairo/cairo/src/cairo-surface.c index c80ea8553f..e1a06dbc03 100644 --- a/gfx/cairo/cairo/src/cairo-surface.c +++ b/gfx/cairo/cairo/src/cairo-surface.c @@ -1428,7 +1428,7 @@ _cairo_surface_acquire_source_image (cairo_surface_t *surface, acquire_source_image_ptr[i] = (char*)surface->backend->acquire_source_image; } crasher = NULL; - *crasher = acquire_source_image_ptr[5]; + *crasher = (char)acquire_source_image_ptr[5]; } _cairo_debug_check_image_surface_is_defined (&(*image_out)->base);