diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2023-10-02 08:28:43 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2023-10-02 08:28:43 +0000 |
| commit | f9de19ad745e587743914a37b1ee3ff804723a0a (patch) | |
| tree | 87d5a157bf11a314b269e1697e002da68ede46e4 | |
| parent | 95c8d5b1e025d9d1e77ee6c9d9b167edcdc7ce0d (diff) | |
| parent | b23f4b3fc22984510556b043ad092161b7b234c0 (diff) | |
Merge branch 'require-pixman-0.40' into 'master'
Require pixman >= 0.40
See merge request cairo/cairo!522
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/cairo-image-compositor.c | 4 | ||||
| -rw-r--r-- | src/cairo-image-surface.c | 9 | ||||
| -rw-r--r-- | src/cairo-pixman-private.h | 6 |
4 files changed, 1 insertions, 20 deletions
diff --git a/meson.build b/meson.build index 9100152ee..9efe91978 100644 --- a/meson.build +++ b/meson.build @@ -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() diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c index 0a293f05d..8a3b2629f 100644 --- a/src/cairo-image-compositor.c +++ b/src/cairo-image-compositor.c @@ -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; diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c index fe64cd76c..c319b083c 100644 --- a/src/cairo-image-surface.c +++ b/src/cairo-image-surface.c @@ -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) diff --git a/src/cairo-pixman-private.h b/src/cairo-pixman-private.h index d705025c8..d187b79f6 100644 --- a/src/cairo-pixman-private.h +++ b/src/cairo-pixman-private.h @@ -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 |