Rework the cairo_matrix_t interface in several ways. Expose a struct for cairo_matrix_t.

Add new function to return current matrix: cairo_get_matrix
Deprecate the following functions (in documentation): cairo_matrix_create cairo_matrix_destroy cairo_matrix_get_affine
Rename: cairo_matrix_set_affine -> cairo_matrix_init cairo_matrix_set_identity -> cairo_matrix_init_identity
Add other new matrix initialization functions: cairo_matrix_init_translate cairo_matrix_init_scale cairo_matrix_init_rotate
Change return type of almost all cairo_matrix functions from cairo_status_t to void.
Track changes to cairo_matrix_t interface.
Add a test case showing the same path drawn under various transforms, (including skews set directly by initializing a cairo_matrix_t).

1 files changed, 111 insertions, 0 deletions

diff --git a/test/transforms.c b/test/transforms.c
new file mode 100644
index 000000000..9b1254aaf
--- /dev/null
+++ b/test/transforms.c
@@ -0,0 +1,111 @@
+/*
+ * Copyright © 2005 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Red Hat, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Red Hat, Inc. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Carl Worth <cworth@cworth.org>
+ */
+
+#include "cairo-test.h"
+
+#define WIDTH 45
+#define HEIGHT 30
+
+cairo_test_t test = {
+    "transforms",
+    "Test various transformations.",
+    WIDTH, HEIGHT
+};
+
+static void
+draw_L_shape (cairo_t *cr)
+{
+    cairo_move_to (cr, 0, 0);
+    cairo_rel_line_to (cr, 0, 10);
+    cairo_rel_line_to (cr, 5, 0);
+
+    cairo_save (cr);
+    cairo_default_matrix (cr);
+    cairo_set_line_width (cr, 2.0);
+    cairo_stroke (cr);
+    cairo_restore (cr);
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_translate (cr, 5, 5);
+
+    draw_L_shape (cr);
+
+    cairo_translate (cr, 10, 0);
+
+    cairo_save (cr);
+    {
+	cairo_scale (cr, 2, 2);
+	draw_L_shape (cr);
+    }
+    cairo_restore (cr);
+
+    cairo_translate (cr, 15, 0);
+
+    cairo_save (cr);
+    {
+	cairo_rotate (cr, M_PI / 2.0);
+	draw_L_shape (cr);
+    }
+    cairo_restore (cr);
+
+    cairo_translate (cr, 5, 0);
+
+    cairo_save (cr);
+    {
+	cairo_matrix_t skew_y = {
+	    1, -1,
+	    0,  1,
+	    0,  0
+	};
+	cairo_transform (cr, &skew_y);
+	draw_L_shape (cr);
+    }
+    cairo_restore (cr);
+
+    cairo_translate (cr, 5, 10);
+    
+    cairo_save (cr);
+    {
+	cairo_matrix_t skew_x = {
+	     1.0, 0.0,
+	    -0.5, 1.0,
+	     0.0, 0.0
+	};
+	cairo_transform (cr, &skew_x);
+	draw_L_shape (cr);
+    }
+    cairo_restore (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+int
+main (void)
+{
+    return cairo_test (&test, draw);
+}