From 09bde1744a75512ff2e54b83d4d003b33c046b8b Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Mon, 8 Jun 2009 21:47:57 -0500 Subject: [PATCH] Revert "scaled_matrix() -> scaling_matrix()" This reverts commit 87a5ddbd0f2709bdeb1d12634a37ad762adc44ab. Conflicts: ChangeLog --- cairomm/matrix.cc | 2 +- cairomm/matrix.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cairomm/matrix.cc b/cairomm/matrix.cc index aa74882..8c1d4d6 100644 --- a/cairomm/matrix.cc +++ b/cairomm/matrix.cc @@ -44,7 +44,7 @@ Matrix translation_matrix(double tx, double ty) return m; } -Matrix scaling_matrix(double sx, double sy) +Matrix scaled_matrix(double sx, double sy) { Matrix m; cairo_matrix_init_scale(&m, sx, sy); diff --git a/cairomm/matrix.h b/cairomm/matrix.h index f7de82b..559eaa5 100644 --- a/cairomm/matrix.h +++ b/cairomm/matrix.h @@ -58,7 +58,7 @@ public: * @sa identity_matrix() * @sa rotation_matrix() * @sa translation_matrix() - * @sa scaling_matrix() + * @sa scaled_matrix() */ Matrix(); @@ -181,7 +181,7 @@ Matrix translation_matrix(double tx, double ty); * * @relates Matrix */ -Matrix scaling_matrix(double sx, double sy); +Matrix scaled_matrix(double sx, double sy); /** Returns a Matrix initialized to a transformation that rotates by radians. * -- 1.6.3.1