* xrender.lisp (render-composite, render-composite-glyphs-8, %render-composite-glyphs): correct some of the request type arguments: CARD16 to INT16. Fixes types errors when using freetype.
Regards Douglas Crosher
Index: Experimental/freetype/xrender.lisp =================================================================== RCS file: /project/mcclim/cvsroot/mcclim/Experimental/freetype/xrender.lisp,v retrieving revision 1.2 diff -u -r1.2 xrender.lisp --- Experimental/freetype/xrender.lisp 2 Dec 2004 09:11:41 -0000 1.2 +++ Experimental/freetype/xrender.lisp 16 Mar 2006 01:31:05 -0000 @@ -719,12 +719,12 @@ (resource-id (picture-id source)) (resource-id (if mask (picture-id mask) 0)) (resource-id (picture-id dest)) - (card16 src-x) - (card16 src-y) - (card16 mask-x) - (card16 mask-y) - (card16 dst-x) - (card16 dst-y) + (int16 src-x) + (int16 src-y) + (int16 mask-x) + (int16 mask-y) + (int16 dst-x) + (int16 dst-y) (card16 width) (card16 height))))
@@ -787,7 +787,7 @@ (int16 src-x) (int16 src-y) (card8 (- end start)) ;length of glyph elt (card8 0) (card16 0) ;padding - (card16 dest-x) (card16 dest-y) ;dx, dy + (int16 dest-x) (int16 dest-y) ;dx, dy ((sequence :format card8) sequence))))
(defmacro %render-composite-glyphs @@ -804,7 +804,7 @@ (int16 ,src-x) (int16 ,src-y) (card8 (- ,end ,start)) ;length of glyph elt (card8 0) (card16 0) ;padding? really? - (card16 ,dest-x) (card16 ,dest-y) ;dx, dy + (int16 ,dest-x) (int16 ,dest-y) ;dx, dy ((sequence :format ,type :start ,start :end ,end :transform ,transform) ,sequence)))
(defun render-composite-glyphs (dest glyph-set source dest-x dest-y sequence