Update of /project/cello/cvsroot/cello/cl-magick In directory clnet:/tmp/cvs-serv15578/cl-magick
Modified Files: cl-magick.lisp cl-magick.lpr wand-texture.lisp Log Message: Ongoing merge with Celtk
--- /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp 2006/05/27 06:01:38 1.3 +++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp 2006/06/26 17:05:22 1.4 @@ -24,6 +24,7 @@ (:nicknames :mgk) (:use #:common-lisp + #:gui-geometry #-(or cormanlisp ccl) #:clos #:cffi #:cffi-extender --- /project/cello/cvsroot/cello/cl-magick/cl-magick.lpr 2006/05/26 22:08:56 1.2 +++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lpr 2006/06/26 17:05:22 1.3 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (May 22, 2006 0:51)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Jun 21, 2006 9:54)"; cg: "1.81"; -*-
(in-package :cg-user)
--- /project/cello/cvsroot/cello/cl-magick/wand-texture.lisp 2006/05/26 22:08:56 1.2 +++ /project/cello/cvsroot/cello/cl-magick/wand-texture.lisp 2006/06/26 17:05:22 1.3 @@ -92,7 +92,7 @@ ;;(print `(wand-image-to-texture loaded texture sized ,(image-size self)))
(fgn-free pixels) - tx)) + tx))
(defmethod wand-render ((self wand-texture) left top right bottom &aux (sz (image-size self)))