[cello-cvs] CVS cello/cl-magick

[ktilton]

Update of /project/cello/cvsroot/cello/cl-magick
In directory clnet:/tmp/cvs-serv11178/cl-magick

Modified Files:
	cl-magick.lisp cl-magick.lpr 
Log Message:


--- /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp	2006/10/02 02:59:18	1.13
+++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp	2006/11/13 05:29:28	1.14
@@ -20,7 +20,7 @@
 ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
 ;;; IN THE SOFTWARE.
 
-;;; $Id: cl-magick.lisp,v 1.13 2006/10/02 02:59:18 ktilton Exp $
+;;; $Id: cl-magick.lisp,v 1.14 2006/11/13 05:29:28 ktilton Exp $
 
 
 (defpackage :cl-magick
@@ -109,14 +109,14 @@
   (when file-path$
     (cl-magick-init)
     (let ((key (list* wand-type (namestring file-path$) iargs)))
-      (or #+nahhh (let ((old (cdr (assoc key (wands-loaded) :test 'equal))))
+      (or (let ((old (cdr (assoc key (wands-loaded) :test 'equal))))
             #+shhh (when old
               (print `(wand-ensure-typed re-using-prior-load ,wand-type ,file-path$)))
             old)
         (let ((wi (apply 'make-instance wand-type
                     :file-path$ file-path$
                     iargs)))
-          #+shh (print `(wand-ensure-typed forced-to-load ,wand-type ,file-path$))
+          ;;(print `(wand-ensure-typed forced-to-load ,wand-type ,file-path$))
           (push (cons key wi) (wands-loaded))
           wi)
         (error "Unable to load image file ~a" file-path$)))))
--- /project/cello/cvsroot/cello/cl-magick/cl-magick.lpr	2006/11/03 13:38:25	1.8
+++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lpr	2006/11/13 05:29:28	1.9
@@ -1,4 +1,4 @@
-;; -*- lisp-version: "8.0 [Windows] (Oct 17, 2006 12:56)"; cg: "1.81"; -*-
+;; -*- lisp-version: "8.0 [Windows] (Nov 6, 2006 16:43)"; cg: "1.81"; -*-
 
 (in-package :cg-user)