summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <ssp@redhat.com>2012-12-08 06:46:38 -0500
committerSøren Sandmann Pedersen <ssp@redhat.com>2012-12-11 09:05:58 -0500
commit6402b2aa0c2215a5add233b3c1bc2ae634d43aaf (patch)
tree2ad27ed855f3b4d80bc0386d81b8f15958e44ef8
parente382e52d675a4ae86ed94ab1124ea7d98c3db75a (diff)
demos/conical-test: Use the draw_checkerboard() utility function
Instead of having its own copy.
-rw-r--r--demos/conical-test.c38
1 files changed, 2 insertions, 36 deletions
diff --git a/demos/conical-test.c b/demos/conical-test.c
index 1e08e42f..6b324301 100644
--- a/demos/conical-test.c
+++ b/demos/conical-test.c
@@ -46,40 +46,6 @@ create_conical (int index)
&c, pixman_double_to_fixed (angle), stops, NUM_STOPS);
}
-#define CHECK_SIZE 25
-
-static void
-fill_checkerboard (pixman_image_t *image, int width, int height)
-{
-#define C1 0xaaaa
-#define C2 0x8888
-
- pixman_color_t check1 = { C1, C1, C1, 0xffff };
- pixman_color_t check2 = { C2, C2, C2, 0xffff };
- pixman_image_t *c1, *c2;
- int i, j;
-
- c1 = pixman_image_create_solid_fill (&check1);
- c2 = pixman_image_create_solid_fill (&check2);
-
- for (j = 0; j < height; j += CHECK_SIZE)
- {
- for (i = 0; i < width; i += CHECK_SIZE)
- {
- pixman_image_t *src;
-
- if ((((i / CHECK_SIZE) ^ (j / CHECK_SIZE)) & 1) == 0)
- src = c1;
- else
- src = c2;
-
- pixman_image_composite32 (PIXMAN_OP_SRC, src, NULL, image,
- 0, 0, 0, 0, i, j,
- CHECK_SIZE, CHECK_SIZE);
- }
- }
-}
-
int
main (int argc, char **argv)
{
@@ -92,8 +58,8 @@ main (int argc, char **argv)
dest_img = pixman_image_create_bits (PIXMAN_a8r8g8b8,
WIDTH, HEIGHT,
NULL, 0);
-
- fill_checkerboard (dest_img, WIDTH, HEIGHT);
+
+ draw_checkerboard (dest_img, 25, 0xffaaaaaa, 0xff888888);
pixman_transform_init_identity (&transform);