From 8c96d914002d839a1b69f49e5549e59e3ccf9fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Lehni?= Date: Wed, 2 Mar 2011 08:52:13 +0100 Subject: [PATCH] Fix errors introduced by bad merge. --- src/basic/Matrix.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/basic/Matrix.js b/src/basic/Matrix.js index 009bf926..dc45951e 100644 --- a/src/basic/Matrix.js +++ b/src/basic/Matrix.js @@ -454,7 +454,7 @@ var Matrix = Base.extend({ /** * Applies this matrix to the specified Canvas Context. */ - applyToContext: function(context) { + applyToContext: function(context, reset) { // Canvas contexts seem to use another orientation: The scaleX (m00) and // scaleY (m11) values need to be flipped to get correct behaviour e.g. // when using rotation or shearing. @@ -469,7 +469,6 @@ var Matrix = Base.extend({ -this._m11, this._m02, this._m12 ); } ->>>>>>> origin/master }, statics: {