fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-09 08:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix warnings and pipeline failure

Browse source
This commit is contained in:
Anton Danilkin 2021-04-13 11:49:32 +02:00
parent 3cb6377c08
commit 982c37f544
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/cairo-svg-surface-private.h
View file

@ -41,10 +41,23 @@
#ifndef CAIRO_SVG_SURFACE_PRIVATE_H #ifndef CAIRO_SVG_SURFACE_PRIVATE_H
#define CAIRO_SVG_SURFACE_PRIVATE_H #define CAIRO_SVG_SURFACE_PRIVATE_H
#include <cairo.h> #include "cairo-svg.h"
void #include "cairo-surface-private.h"
struct _cairo_svg_surface_start {
cairo_surface_t base;
cairo_bool_t force_fallbacks;
};
static inline void
_cairo_svg_surface_set_force_fallbacks (void *abstract_surface, _cairo_svg_surface_set_force_fallbacks (void *abstract_surface,
cairo_bool_t force_fallbacks); cairo_bool_t force_fallbacks)
{
struct _cairo_svg_surface_start *surface = (struct _cairo_svg_surface_start *) abstract_surface;
surface->force_fallbacks = force_fallbacks;
}
#endif /* CAIRO_SVG_SURFACE_PRIVATE_H */ #endif /* CAIRO_SVG_SURFACE_PRIVATE_H */

18
src/cairo-svg-surface.c
View file

@ -77,7 +77,7 @@
* Since: 1.2 * Since: 1.2
**/ **/
static const int invalid_pattern_id = -1; static const unsigned int invalid_pattern_id = -1;
static const cairo_svg_version_t _cairo_svg_versions[] = static const cairo_svg_version_t _cairo_svg_versions[] =
{ {
@ -209,9 +209,12 @@ typedef struct _cairo_svg_document {
cairo_hash_table_t *paints; cairo_hash_table_t *paints;
} cairo_svg_document_t; } cairo_svg_document_t;
// Must be compatible with the struct _cairo_svg_surface_start.
typedef struct _cairo_svg_surface { typedef struct _cairo_svg_surface {
cairo_surface_t base; cairo_surface_t base;
cairo_bool_t force_fallbacks;
unsigned int source_id; unsigned int source_id;
unsigned int depth; unsigned int depth;
@ -236,8 +239,6 @@ typedef struct _cairo_svg_surface {
cairo_bool_t transitive_paint_used; cairo_bool_t transitive_paint_used;
cairo_paginated_mode_t paginated_mode; cairo_paginated_mode_t paginated_mode;
cairo_bool_t force_fallbacks;
} cairo_svg_surface_t; } cairo_svg_surface_t;
static cairo_status_t static cairo_status_t
@ -419,15 +420,6 @@ _extract_svg_surface (cairo_surface_t *surface,
return TRUE; return TRUE;
} }
void
_cairo_svg_surface_set_force_fallbacks (void *abstract_surface,
cairo_bool_t force_fallbacks)
{
cairo_svg_surface_t *surface = (cairo_svg_surface_t *) abstract_surface;
surface->force_fallbacks = force_fallbacks;
}
/** /**
* cairo_svg_surface_restrict_to_version: * cairo_svg_surface_restrict_to_version:
* @surface: a SVG #cairo_surface_t * @surface: a SVG #cairo_surface_t
@ -1397,7 +1389,7 @@ _cairo_svg_surface_finish (void *abstract_surface)
return status; return status;
} }
static char * static const char *
_cairo_svg_surface_emit_static_filter (cairo_svg_document_t *document, enum cairo_svg_filter filter) _cairo_svg_surface_emit_static_filter (cairo_svg_document_t *document, enum cairo_svg_filter filter)
{ {
if (!document->filters_emitted[filter]) { if (!document->filters_emitted[filter]) {