[cello-cvs] CVS cello/cl-magick

[ktilton]

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

Modified Files:
	cl-magick.lisp wand-image.lisp 
Log Message:


--- /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp	2006/09/05 23:05:37	1.12
+++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lisp	2006/10/02 02:59:18	1.13
@@ -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.12 2006/09/05 23:05:37 ktilton Exp $
+;;; $Id: cl-magick.lisp,v 1.13 2006/10/02 02:59:18 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 (let ((old (cdr (assoc key (wands-loaded) :test 'equal))))
-            (when old
+      (or #+nahhh (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)))
-          (print `(wand-ensure-typed forced-to-load ,wand-type ,file-path$))
+          #+shh (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$)))))
@@ -129,3 +129,4 @@
       (print `(unloading foreign library ,dll))
       (setf *imagick-dll-loaded* nil)
       (ff:unload-foreign-library dll))))
+
--- /project/cello/cvsroot/cello/cl-magick/wand-image.lisp	2006/09/05 23:05:37	1.8
+++ /project/cello/cvsroot/cello/cl-magick/wand-image.lisp	2006/10/02 02:59:18	1.9
@@ -100,8 +100,8 @@
            (rows (- last-row first-row))
            (pixels (fgn-alloc :unsigned-char (* 3 columns rows) :wand-image)))
       (assert (not (zerop pixels))() "wand-get-image-pixels > fgn-alloc of ~a bytes failed" (* 3 columns rows))
-      (print (list "wand-get-image-pixels got" wand (* 3 columns rows) pixels)) ;; frgo: debug ...
-      (cells:trc "image format" wand (magick-get-image-format wand)) ;; frgo:debug...
+      ;;(print (list "wand-get-image-pixels got" wand (* 3 columns rows) pixels)) ;; frgo: debug ...
+      (cells:trc nil "image format" wand (magick-get-image-format wand)) ;; frgo:debug...
       ;
       ; these next two are quite slow thx to FFI I guess
       ;
@@ -115,7 +115,7 @@
 
       (magick-get-image-pixels wand first-col first-row columns rows "RGB" 0 pixels )
      ;;(print `(writeimage ,(magick-write-image wand "/tmp/wand-image-test.jpg")))
-      (progn
+      #+shhh (progn
         ;
         ; look at a few pixels
         ;