[pango/line-breaker: 15/31] Port test-pangocairo-threads
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/line-breaker: 15/31] Port test-pangocairo-threads
- Date: Mon, 24 Jan 2022 06:34:26 +0000 (UTC)
commit fb3f57243adb7865ced0f117ef1e5c34696eea70
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Jan 19 07:05:29 2022 -0500
Port test-pangocairo-threads
tests/test-pangocairo-threads.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/tests/test-pangocairo-threads.c b/tests/test-pangocairo-threads.c
index ea97fc17..308f87e4 100644
--- a/tests/test-pangocairo-threads.c
+++ b/tests/test-pangocairo-threads.c
@@ -18,17 +18,20 @@ create_surface (void)
return cairo_image_surface_create (CAIRO_FORMAT_A8, WIDTH, HEIGHT);
}
-static PangoLayout *
+static PangoSimpleLayout *
create_layout (cairo_t *cr)
{
- PangoLayout *layout = pango_cairo_create_layout (cr);
- pango_layout_set_text (layout, text, -1);
- pango_layout_set_width (layout, WIDTH * PANGO_SCALE);
+ PangoSimpleLayout *layout;
+
+ layout = pango_cairo_create_simple_layout (cr);
+ pango_simple_layout_set_text (layout, text, -1);
+ pango_simple_layout_set_width (layout, WIDTH * PANGO_SCALE);
+
return layout;
}
static void
-draw (cairo_t *cr, PangoLayout *layout, unsigned int i)
+draw (cairo_t *cr, PangoSimpleLayout *layout, unsigned int i)
{
cairo_set_source_rgba (cr, 1, 1, 1, 1);
cairo_paint (cr);
@@ -37,16 +40,16 @@ draw (cairo_t *cr, PangoLayout *layout, unsigned int i)
cairo_identity_matrix (cr);
cairo_scale (cr, (100 + i) / 100., (100 + i) / 100.);
- pango_cairo_update_layout (cr, layout);
+ pango_cairo_update_context (cr, pango_simple_layout_get_context (layout));
- pango_cairo_show_layout (cr, layout);
+ pango_cairo_show_lines (cr, pango_simple_layout_get_lines (layout));
}
static gpointer
thread_func (gpointer data)
{
cairo_surface_t *surface = data;
- PangoLayout *layout;
+ PangoSimpleLayout *layout;
int i;
cairo_t *cr = cairo_create (surface);
@@ -99,7 +102,7 @@ pangocairo_threads (void)
{
cairo_surface_t *ref_surface = create_surface ();
cairo_t *cr = cairo_create (ref_surface);
- PangoLayout *layout = create_layout (cr);
+ PangoSimpleLayout *layout = create_layout (cr);
unsigned char *ref_data = cairo_image_surface_get_data (ref_surface);
unsigned int len = WIDTH * HEIGHT;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]