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

Require pixman >= 0.40

Browse source
This commit is contained in:
Adrian Johnson 2023-10-02 15:56:04 +10:30
parent 0fce59ff8d
commit b23f4b3fc2
4 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -633,7 +633,7 @@ if feature_conf.get('CAIRO_HAS_SVG_SURFACE', 0) == 1
endif
pixman_dep = dependency('pixman-1',
version: '>= 0.36.0',
version: '>= 0.40.0',
fallback: ['pixman', 'idep_pixman'],
)
if pixman_dep.found()

4
src/cairo-image-compositor.c
View file

@ -696,7 +696,6 @@ composite_traps (void *_dst,
return CAIRO_STATUS_SUCCESS;
}
#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,22,0)
static void
set_point (pixman_point_fixed_t *p, cairo_point_t *c)
{
@ -797,7 +796,6 @@ composite_tristrip (void *_dst,
return CAIRO_STATUS_SUCCESS;
}
#endif
static cairo_int_status_t
check_composite_glyphs (const cairo_composite_rectangles_t *extents,
@ -1296,9 +1294,7 @@ _cairo_image_traps_compositor_get (void)
//compositor.check_composite_traps = check_composite_traps;
compositor.composite_traps = composite_traps;
//compositor.check_composite_tristrip = check_composite_traps;
#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,22,0)
compositor.composite_tristrip = composite_tristrip;
#endif
compositor.check_composite_glyphs = check_composite_glyphs;
compositor.composite_glyphs = composite_glyphs;

9
src/cairo-image-surface.c
View file

@ -109,12 +109,8 @@ _cairo_format_from_pixman_format (pixman_format_code_t pixman_format)
return CAIRO_FORMAT_A1;
case PIXMAN_r5g6b5:
return CAIRO_FORMAT_RGB16_565;
#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,22,0)
case PIXMAN_r8g8b8a8: case PIXMAN_r8g8b8x8:
#endif
#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,27,2)
case PIXMAN_a8r8g8b8_sRGB:
#endif
case PIXMAN_a8b8g8r8: case PIXMAN_x8b8g8r8: case PIXMAN_r8g8b8:
case PIXMAN_b8g8r8: case PIXMAN_b5g6r5:
case PIXMAN_a1r5g5b5: case PIXMAN_x1r5g5b5: case PIXMAN_a1b5g5r5:
@ -131,9 +127,7 @@ _cairo_format_from_pixman_format (pixman_format_code_t pixman_format)
case PIXMAN_a2b10g10r10:
case PIXMAN_x2b10g10r10:
case PIXMAN_a2r10g10b10:
#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,22,0)
case PIXMAN_x14r6g6b6:
#endif
default:
return CAIRO_FORMAT_INVALID;
}
@ -248,7 +242,6 @@ _pixman_format_from_masks (cairo_format_masks_t *masks,
return TRUE;
}
#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0,39,0)
/* Convenience function to convert #cairo_dither_t into #pixman_dither_t */
static pixman_dither_t
_cairo_dither_to_pixman_dither (cairo_dither_t dither)
@ -266,8 +259,6 @@ _cairo_dither_to_pixman_dither (cairo_dither_t dither)
return PIXMAN_DITHER_NONE;
}
}
#endif
/* A mask consisting of N bits set to 1. */
#define MASK(N) ((1UL << (N))-1)

6
src/cairo-pixman-private.h
View file

@ -42,10 +42,4 @@
#include <pixman.h>
#if PIXMAN_VERSION < PIXMAN_VERSION_ENCODE(0,22,0)
#define pixman_image_composite32 pixman_image_composite
#define pixman_image_get_component_alpha(i) 0
#define pixman_image_set_component_alpha(i, x) do { } while (0)
#endif
#endif