From 71b63cbbd643ceb1eab36714f5c8883f494d15e0 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 17 Oct 2010 14:40:47 +0200 Subject: gnome-canvas: Remove gnome_canvas_w2c_affine() It's not necessary anymore. Use gnome_canvas_w2c_matrix() instead. --- libgnomecanvas/gnome-canvas.c | 26 -------------------------- libgnomecanvas/gnome-canvas.h | 2 -- 2 files changed, 28 deletions(-) (limited to 'libgnomecanvas') diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c index 16c16512f9..d467d8f545 100644 --- a/libgnomecanvas/gnome-canvas.c +++ b/libgnomecanvas/gnome-canvas.c @@ -3562,32 +3562,6 @@ gnome_canvas_request_redraw (GnomeCanvas *canvas, gint x1, gint y1, gint x2, gin } } -/** - * gnome_canvas_w2c_affine: - * @canvas: A canvas. - * @affine: An affine transformation matrix (return value). - * - * Gets the affine transform that converts from world coordinates to canvas - * pixel coordinates. - **/ -void -gnome_canvas_w2c_affine (GnomeCanvas *canvas, gdouble affine[6]) -{ - gdouble zooom; - - g_return_if_fail (GNOME_IS_CANVAS (canvas)); - g_return_if_fail (affine != NULL); - - zooom = canvas->pixels_per_unit; - - affine[0] = zooom; - affine[1] = 0; - affine[2] = 0; - affine[3] = zooom; - affine[4] = -canvas->scroll_x1 * zooom; - affine[5] = -canvas->scroll_y1 * zooom; -} - /** * gnome_canvas_w2c_matrix: * @canvas: A canvas. diff --git a/libgnomecanvas/gnome-canvas.h b/libgnomecanvas/gnome-canvas.h index 454bc3f0f1..b940f67748 100644 --- a/libgnomecanvas/gnome-canvas.h +++ b/libgnomecanvas/gnome-canvas.h @@ -43,7 +43,6 @@ #include #include #include -#include G_BEGIN_DECLS @@ -505,7 +504,6 @@ void gnome_canvas_request_redraw (GnomeCanvas *canvas, gint x1, gint y1, gint x2 /* Gets the affine transform that converts world coordinates into canvas pixel * coordinates. */ -void gnome_canvas_w2c_affine (GnomeCanvas *canvas, gdouble affine[6]); void gnome_canvas_w2c_matrix (GnomeCanvas *canvas, cairo_matrix_t *matrix); void gnome_canvas_c2w_matrix (GnomeCanvas *canvas, cairo_matrix_t *matrix); -- cgit