From c470da880479bee6a13115ccb70d62cdcf6f532c Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Fri, 7 Sep 2007 07:13:55 +0000 Subject: [PATCH 1/1] Bug fix in SCALE-TO-DEVICE Organization: Straylight/Edgeware From: espen --- cairo/cairo.lisp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cairo/cairo.lisp b/cairo/cairo.lisp index d17b80e..23e14e2 100644 --- a/cairo/cairo.lisp +++ b/cairo/cairo.lisp @@ -20,7 +20,7 @@ ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -;; $Id: cairo.lisp,v 1.14 2007-08-23 21:12:43 espen Exp $ +;; $Id: cairo.lisp,v 1.15 2007-09-07 07:13:55 espen Exp $ (in-package "CAIRO") @@ -578,10 +578,11 @@ (defbinding scale (cr sx &optional (sy sx)) nil (defun scale-to-device (cr &optional keep-rotation-p) (if keep-rotation-p (multiple-value-call #'scale cr (device-to-user-distance cr 1.0)) - (multiple-value-bind (x y) - (multiple-value-call #'user-to-device cr (get-current-point cr)) -; (identity-matrix cr) - (setf (matrix cr) (matrix-init-identity)) + (multiple-value-bind (x y) + (with-context (cr) + (move-to cr 0.0 0.0) + (multiple-value-call #'user-to-device cr (get-current-point cr))) + (identity-matrix cr) (translate cr x y)))) (defbinding rotate () nil -- [mdw]