Added CAIRO-REGION

[clg] / cairo / cairo.lisp

diff --git a/cairo/cairo.lisp b/cairo/cairo.lisp
index a87c6bb..23e14e2 100644 (file)
--- 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.13 2007-06-04 10:42:53 espen Exp $
+;; $Id: cairo.lisp,v 1.15 2007-09-07 07:13:55 espen Exp $
 
 (in-package "CAIRO")
 
@@ -40,7 +40,7 @@
   (define-enum-type fill-rule :winding :even-odd)
   (define-enum-type line-cap :butt :round :square)
   (define-enum-type line-join :miter :round :bevel)    
-  (define-enum-type font-slant :normal :itaic :oblique)
+  (define-enum-type font-slant :normal :italic :oblique)
   (define-enum-type font-weight :normal :bold)
 
   (define-enum-type operator
@@ -470,9 +470,9 @@
 
 (defmacro defpath (name args &optional relative-p)
   (flet ((def (name type)
-          `(progn
-             ,(when (eq type 'optimized-double-float)
-                `(declaim (ftype (function (context ,@(loop repeat (length args) collect 'double-float))) ,(first name))))
+          `(progn
+             ,(when (eq type 'optimized-double-float)
+                `(declaim (inline ,(first name))))
              (defbinding ,name () nil
                (cr context)
                ,@(mapcar #'(lambda (arg) (list arg type)) args)))))
@@ -578,10 +578,11 @@
 (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