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

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

--- /project/cello/cvsroot/cello/cl-magick/cl-magick.lpr 2006/06/26 17:05:22 1.3 +++ /project/cello/cvsroot/cello/cl-magick/cl-magick.lpr 2006/07/03 00:35:13 1.4 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "8.0 [Windows] (Jun 21, 2006 9:54)"; cg: "1.81"; -*- +;; -*- lisp-version: "8.0 [Windows] (Jun 28, 2006 10:53)"; cg: "1.81"; -*-

(in-package :cg-user)

--- /project/cello/cvsroot/cello/cl-magick/wand-pixels.lisp 2006/05/17 16:14:29 1.1 +++ /project/cello/cvsroot/cello/cl-magick/wand-pixels.lisp 2006/07/03 00:35:13 1.2 @@ -39,16 +39,17 @@ "only works in ortho mode I think; abstract out raster-pos for perspective" (declare (ignorable right left)) (assert (pixels self)) - #+not (trc nil "!!!! pixelrender entry rasterpos:" + + (ukt:trc nil "!!!! pixelrender entry rasterpos:" (ogl-raster-pos-get) :lrtb (list left right top bottom) :image-sz sz) (let ((y-move (downs (+ 0 (abs (- top bottom)))))) (with-bitmap-shifted (0 y-move) - ;; (trc nil "wand-render pixels move" 0 y-move :top top :bottom bottom) - #+hush + (ukt:trc nil "wand-render pixels move" 0 y-move :top top :bottom bottom) + (if (ogl-get-boolean gl_current_raster_position_valid) (progn - (format t "~&rasterpos ~a OK: ~a" + #+shh (format t "~&rasterpos ~a OK: ~a" (ogl-raster-pos-get) (list left right top bottom) )) (format t "~&in wand-render rasterpos ~a invalid, goffset is ???" (ogl-raster-pos-get) self )) @@ -69,7 +70,8 @@ (gl-blend-func gl_src_alpha gl_one_minus_src_alpha) (gl-polygon-mode gl_front_and_back gl_fill) #+not (trc nil "wand-pixelling" (ogl-raster-pos-get)) - - (gl-draw-pixels (car sz) (cdr sz) + (gl-pixel-storei gl_unpack_alignment 1 ) + + (gl-draw-pixels (+ (car sz) 0) (cdr sz) gl_rgb gl_unsigned_byte (pixels self)) (ogl::glec :draw-pixels)))) \ No newline at end of file