Use a more interesting pattern than "blue" for canvas import/export tests.

5 files changed, 68 insertions, 6 deletions

diff --git a/libdimension/tests/Makefile.am b/libdimension/tests/Makefile.am
index 265c51a..eec2e9d 100644
--- a/libdimension/tests/Makefile.am
+++ b/libdimension/tests/Makefile.am
@@ -40,7 +40,8 @@ if !GL
 XFAIL_TESTS += gl.test
 endif
 
-libdimension_tests_la_SOURCES = tests.h
+libdimension_tests_la_SOURCES = test_canvas.c                                  \
+                                tests.h
 libdimension_tests_la_LIBADD  = $(top_builddir)/libdimension/libdimension.la
 
 if GLX
diff --git a/libdimension/tests/gl.c b/libdimension/tests/gl.c
index c71822c..52b3256 100644
--- a/libdimension/tests/gl.c
+++ b/libdimension/tests/gl.c
@@ -36,8 +36,8 @@ main(void)
     return EXIT_FAILURE;
   }
 
-  /* Paint the canvas blue */
-  dmnsn_clear_canvas(canvas, dmnsn_blue);
+  /* Paint the test pattern */
+  dmnsn_paint_test_canvas(canvas);
 
   /* Create a new glX display */
   dmnsn_display *display = dmnsn_new_display(canvas);
diff --git a/libdimension/tests/png.c b/libdimension/tests/png.c
index 328ee36..1bd418f 100644
--- a/libdimension/tests/png.c
+++ b/libdimension/tests/png.c
@@ -37,8 +37,8 @@ main(void)
     return EXIT_FAILURE;
   }
 
-  /* Paint the canvas blue */
-  dmnsn_clear_canvas(canvas, dmnsn_blue);
+  /* Paint the test pattern */
+  dmnsn_paint_test_canvas(canvas);
 
   /* Write the image to PNG */
 
diff --git a/libdimension/tests/test_canvas.c b/libdimension/tests/test_canvas.c
new file mode 100644
index 0000000..b5d02ad
--- /dev/null
+++ b/libdimension/tests/test_canvas.c
@@ -0,0 +1,56 @@
+/*************************************************************************
+ * Copyright (C) 2011 Tavian Barnes <tavianator@tavianator.com>          *
+ *                                                                       *
+ * This file is part of The Dimension Test Suite.                        *
+ *                                                                       *
+ * The Dimension Test Suite is free software; you can redistribute it    *
+ * and/or modify it under the terms of the GNU General Public License as *
+ * published by the Free Software Foundation; either version 3 of the    *
+ * License, or (at your option) any later version.                       *
+ *                                                                       *
+ * The Dimension Test Suite is distributed in the hope that it will be   *
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty   *
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  *
+ * General Public License for more details.                              *
+ *                                                                       *
+ * You should have received a copy of the GNU General Public License     *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
+ *************************************************************************/
+
+#include "tests.h"
+
+void
+dmnsn_paint_test_canvas(dmnsn_canvas *canvas)
+{
+  static const size_t size = 8;
+
+  for (size_t y = 0; y < canvas->height; ++y) {
+    for (size_t x = 0; x < canvas->width; ++x) {
+      dmnsn_color a, b;
+      double n = 3.0*x/canvas->width;
+      if (x < canvas->width/3) {
+        a = dmnsn_red;
+        b = dmnsn_green;
+      } else if (x < 2*canvas->width/3) {
+        a = dmnsn_green;
+        b = dmnsn_blue;
+        n -= 1.0;
+      } else {
+        a = dmnsn_blue;
+        b = dmnsn_red;
+        n -= 2.0;
+      }
+
+      if ((x*y)%(2*size) < size) {
+        a = dmnsn_color_to_sRGB(a);
+        b = dmnsn_color_to_sRGB(b);
+      }
+      dmnsn_color color = dmnsn_color_gradient(a, b, n);
+      if ((x*y)%(2*size) < size) {
+        color = dmnsn_color_from_sRGB(color);
+      }
+
+      dmnsn_set_pixel(canvas, x, y, color);
+    }
+  }
+}
diff --git a/libdimension/tests/tests.h b/libdimension/tests/tests.h
index d61e442..38d9107 100644
--- a/libdimension/tests/tests.h
+++ b/libdimension/tests/tests.h
@@ -1,5 +1,5 @@
 /*************************************************************************
- * Copyright (C) 2009-2010 Tavian Barnes <tavianator@tavianator.com>     *
+ * Copyright (C) 2009-2011 Tavian Barnes <tavianator@tavianator.com>     *
  *                                                                       *
  * This file is part of The Dimension Test Suite.                        *
  *                                                                       *
@@ -28,6 +28,11 @@ extern "C" {
 #endif
 
 /*
+ * Test canvas
+ */
+void dmnsn_paint_test_canvas(dmnsn_canvas *canvas);
+
+/*
  * Windowing
  */