summaryrefslogtreecommitdiff
path: root/tests/conform/test-texture-pixmap-x11.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/conform/test-texture-pixmap-x11.c')
-rw-r--r--tests/conform/test-texture-pixmap-x11.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/conform/test-texture-pixmap-x11.c b/tests/conform/test-texture-pixmap-x11.c
index 7f6d81c4..4e8d5505 100644
--- a/tests/conform/test-texture-pixmap-x11.c
+++ b/tests/conform/test-texture-pixmap-x11.c
@@ -83,10 +83,10 @@ update_pixmap (TestState *state)
XFreeGC (state->display, black_gc);
}
-static gboolean
+static CoglBool
check_paint (TestState *state, int x, int y, int scale)
{
- guint8 *data, *p, update_value = 0;
+ uint8_t *data, *p, update_value = 0;
p = data = g_malloc (PIXMAP_WIDTH * PIXMAP_HEIGHT * 4);
@@ -117,7 +117,7 @@ check_paint (TestState *state, int x, int y, int scale)
}
else
{
- guint8 value = ((grid_x ^ grid_y) & 1) ? 0x00 : 0xff;
+ uint8_t value = ((grid_x ^ grid_y) & 1) ? 0x00 : 0xff;
g_assert_cmpint (*(p++), ==, value);
g_assert_cmpint (*(p++), ==, value);
g_assert_cmpint (*(p++), ==, value);
@@ -167,7 +167,7 @@ on_paint (ClutterActor *actor, TestState *state)
if (state->frame_count >= 5)
{
- gboolean big_updated, small_updated;
+ CoglBool big_updated, small_updated;
big_updated = check_paint (state, 0, 0, 1);
small_updated = check_paint (state, 0, PIXMAP_HEIGHT, 4);
@@ -187,8 +187,8 @@ on_paint (ClutterActor *actor, TestState *state)
state->frame_count++;
}
-static gboolean
-queue_redraw (gpointer stage)
+static CoglBool
+queue_redraw (void *stage)
{
clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));