Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/cairo/patches/cairo-1.17.8-tee-fix-cairo-wrapper-functions.patch

    Contents of /trunk/cairo/patches/cairo-1.17.8-tee-fix-cairo-wrapper-functions.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3773 - (show annotations) (download)
    Mon Sep 4 13:26:34 2023 UTC (9 months ago) by niro
    File size: 3881 byte(s) 
    -some fixes
    1 From 5e42a5277eddafd312a73e355d7775a4401dae4e Mon Sep 17 00:00:00 2001
    2 From: Emmanuele Bassi <ebassi@gnome.org>
    3 Date: Fri, 3 Feb 2023 15:40:12 +0100
    4 Subject: [PATCH] tee: Fix cairo wrapper functions
    5
    6 Follow-up to !391 to apply the same changes to the (disabled by default)
    7 tee surface.
    8
    9 Fixes: #634
    10 ---
    11 src/cairo-tee-surface.c | 24 ++++++++++++++----------
    12 1 file changed, 14 insertions(+), 10 deletions(-)
    13
    14 diff --git a/src/cairo-tee-surface.c b/src/cairo-tee-surface.c
    15 index 7a94c9bca..4994a5a60 100644
    16 --- a/src/cairo-tee-surface.c
    17 +++ b/src/cairo-tee-surface.c
    18 @@ -220,12 +220,12 @@ _cairo_tee_surface_paint (void *abstract_surface,
    19 num_slaves = _cairo_array_num_elements (&surface->slaves);
    20 slaves = _cairo_array_index (&surface->slaves, 0);
    21 for (n = 0; n < num_slaves; n++) {
    22 - status = _cairo_surface_wrapper_paint (&slaves[n], op, source, clip);
    23 + status = _cairo_surface_wrapper_paint (&slaves[n], op, source, 0, clip);
    24 if (unlikely (status))
    25 return status;
    26 }
    27
    28 - return _cairo_surface_wrapper_paint (&surface->master, op, source, clip);
    29 + return _cairo_surface_wrapper_paint (&surface->master, op, source, 0, clip);
    30 }
    31
    32 static cairo_int_status_t
    33 @@ -244,13 +244,17 @@ _cairo_tee_surface_mask (void *abstract_surface,
    34 slaves = _cairo_array_index (&surface->slaves, 0);
    35 for (n = 0; n < num_slaves; n++) {
    36 status = _cairo_surface_wrapper_mask (&slaves[n],
    37 - op, source, mask, clip);
    38 + op, source, 0,
    39 + mask, 0,
    40 + clip);
    41 if (unlikely (status))
    42 return status;
    43 }
    44
    45 return _cairo_surface_wrapper_mask (&surface->master,
    46 - op, source, mask, clip);
    47 + op, source, 0,
    48 + mask, 0,
    49 + clip);
    50 }
    51
    52 static cairo_int_status_t
    53 @@ -274,7 +278,7 @@ _cairo_tee_surface_stroke (void *abstract_surface,
    54 slaves = _cairo_array_index (&surface->slaves, 0);
    55 for (n = 0; n < num_slaves; n++) {
    56 status = _cairo_surface_wrapper_stroke (&slaves[n],
    57 - op, source,
    58 + op, source, 0,
    59 path, style,
    60 ctm, ctm_inverse,
    61 tolerance, antialias,
    62 @@ -284,7 +288,7 @@ _cairo_tee_surface_stroke (void *abstract_surface,
    63 }
    64
    65 return _cairo_surface_wrapper_stroke (&surface->master,
    66 - op, source,
    67 + op, source, 0,
    68 path, style,
    69 ctm, ctm_inverse,
    70 tolerance, antialias,
    71 @@ -310,7 +314,7 @@ _cairo_tee_surface_fill (void *abstract_surface,
    72 slaves = _cairo_array_index (&surface->slaves, 0);
    73 for (n = 0; n < num_slaves; n++) {
    74 status = _cairo_surface_wrapper_fill (&slaves[n],
    75 - op, source,
    76 + op, source, 0,
    77 path, fill_rule,
    78 tolerance, antialias,
    79 clip);
    80 @@ -319,7 +323,7 @@ _cairo_tee_surface_fill (void *abstract_surface,
    81 }
    82
    83 return _cairo_surface_wrapper_fill (&surface->master,
    84 - op, source,
    85 + op, source, 0,
    86 path, fill_rule,
    87 tolerance, antialias,
    88 clip);
    89 @@ -361,7 +365,7 @@ _cairo_tee_surface_show_text_glyphs (void *abstract_surface,
    90 for (n = 0; n < num_slaves; n++) {
    91 memcpy (glyphs_copy, glyphs, sizeof (cairo_glyph_t) * num_glyphs);
    92 status = _cairo_surface_wrapper_show_text_glyphs (&slaves[n], op,
    93 - source,
    94 + source, 0,
    95 utf8, utf8_len,
    96 glyphs_copy, num_glyphs,
    97 clusters, num_clusters,
    98 @@ -374,7 +378,7 @@ _cairo_tee_surface_show_text_glyphs (void *abstract_surface,
    99
    100 memcpy (glyphs_copy, glyphs, sizeof (cairo_glyph_t) * num_glyphs);
    101 status = _cairo_surface_wrapper_show_text_glyphs (&surface->master, op,
    102 - source,
    103 + source, 0,
    104 utf8, utf8_len,
    105 glyphs_copy, num_glyphs,
    106 clusters, num_clusters,
    107 --
    108 2.39.2
    109