From: espen Date: Mon, 19 Feb 2007 14:39:44 +0000 (+0000) Subject: Using make-instance to create surfaces from PNG images X-Git-Tag: clg-0-93~188 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/commitdiff_plain/a8ce1160b750fe4c25d086a80f11bec4207e14fb Using make-instance to create surfaces from PNG images --- diff --git a/examples/testcairo.lisp b/examples/testcairo.lisp index 0cf9fdb..f7b6b71 100644 --- a/examples/testcairo.lisp +++ b/examples/testcairo.lisp @@ -124,9 +124,9 @@ (define-snippet clip-image (cr) (cairo:clip cr) (cairo:new-path cr) - (let ((image (cairo:image-surface-create-from-png - #p"clg:examples;romedalen.png"))) - + (let ((image (make-instance 'cairo:image-surface + :filename #p"clg:examples;romedalen.png"))) + (let ((width (cairo:surface-width image)) (height (cairo:surface-height image))) (cairo:scale cr (/ 1.0 width) (/ 1.0 height))) @@ -278,8 +278,8 @@ (define-snippet gradient (cr) (define-snippet image (cr) - (let ((image (cairo:image-surface-create-from-png - #p"clg:examples;romedalen.png"))) + (let ((image (make-instance 'cairo:image-surface + :filename #p"clg:examples;romedalen.png"))) (cairo:translate cr 0.5 0.5) (cairo:rotate cr (deg-to-rad 45.0)) (let ((width (cairo:surface-width image)) @@ -291,8 +291,8 @@ (define-snippet image (cr) (define-snippet image-pattern (cr) - (let* ((image (cairo:image-surface-create-from-png - #p"clg:examples;romedalen.png")) + (let* ((image (make-instance 'cairo:image-surface + :filename #p"clg:examples;romedalen.png")) (pattern (cairo:pattern-create-for-surface image))) (setf (cairo:pattern-extend pattern) :repeat) (cairo:translate cr 0.5 0.5)