[Douglas Crosher] [mcclim-devel] Patch: xrender request type arguments corrections.
Christophe Rhodes <[email protected]> Fri, 17 Mar 2006 14:30:48 +0000
| Newsgroups | gmane.lisp.clx.devel |
|---|---|
| Message-ID | <[email protected]> |
--=-=-= Hi, This was sent to the mcclim development list, but is relevant to portable-clx too. Cheers, Christophe --=-=-= Content-Type: message/rfc822 Content-Disposition: inline X-From-Line: [email protected] Thu Mar 16 01:57:00 2006 Return-path: <[email protected]> Envelope-to: real-csr21@localhost Delivery-date: Thu, 16 Mar 2006 01:57:00 +0000 Received: from localhost ([127.0.0.1]) by mu with esmtp (Exim 4.60) (envelope-from <[email protected]>) id 1FJhjX-0001uK-Or for real-csr21@localhost; Thu, 16 Mar 2006 01:56:59 +0000 Received: from imap.hermes.cam.ac.uk [131.111.8.150] by localhost with IMAP (fetchmail-6.2.5.4) for real-csr21@localhost (single-drop); Thu, 16 Mar 2006 01:56:59 +0000 (GMT) Received: from ppsw-7-intramail.csi.cam.ac.uk ([192.168.128.137]) by cyrus-13.csi.private.cam.ac.uk (Cyrus v2.1.16-HERMES) with LMTP; Thu, 16 Mar 2006 01:44:38 +0000 X-Sieve: CMU Sieve 2.2 X-Cam-SpamDetails: scanned, SpamAssassin (score=0) X-Cam-AntiVirus: No virus found X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/ Received: from common-lisp.net ([80.68.86.115]:44991) by ppsw-7.csi.cam.ac.uk (mx.cam.ac.uk [131.111.8.147]:25) with esmtp (csa=unknown) id 1FJhXW-0003xx-Oh (Exim 4.54) for [email protected] (return-path <[email protected]>); Thu, 16 Mar 2006 01:44:34 +0000 Received: by common-lisp.net (Postfix, from userid 65534) id 6BC0D30006; Wed, 15 Mar 2006 20:42:50 -0500 (EST) Received: from common-lisp.net (localhost [127.0.0.1]) by common-lisp.net (Postfix) with ESMTP id C38832F00B; Wed, 15 Mar 2006 20:42:49 -0500 (EST) X-Original-To: [email protected] Delivered-To: [email protected] Received: by common-lisp.net (Postfix, from userid 65534) id 725302F007; Wed, 15 Mar 2006 20:42:48 -0500 (EST) Received: from gw.scieneer.com (unknown [139.130.216.140]) by common-lisp.net (Postfix) with ESMTP id 52589290E9 for <[email protected]>; Wed, 15 Mar 2006 20:42:44 -0500 (EST) Received: from [10.0.0.100] (dtc-pc.scieneer.com [10.0.0.100]) by gw.scieneer.com (8.13.1/8.13.1) with ESMTP id k2G1iKaA019136 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for <[email protected]>; Thu, 16 Mar 2006 12:44:21 +1100 Message-ID: <[email protected]> Date: Thu, 16 Mar 2006 12:44:20 +1100 From: Douglas Crosher <[email protected]> Organization: Scieneer Pty Ltd User-Agent: Mozilla Thunderbird 1.0.7-1.1.fc4 (X11/20050929) X-Accept-Language: en-us, en To: [email protected] Subject: [mcclim-devel] Patch: xrender request type arguments corrections. X-BeenThere: [email protected] X-Mailman-Version: 2.1.5 Precedence: list List-Id: mcclim-devel.common-lisp.net List-Unsubscribe: <http://common-lisp.net/cgi-bin/mailman/listinfo/mcclim-devel>, <mailto:[email protected]?subject=unsubscribe> List-Archive: <http://common-lisp.net/pipermail/mcclim-devel> List-Post: <mailto:[email protected]> List-Help: <mailto:[email protected]?subject=help> List-Subscribe: <http://common-lisp.net/cgi-bin/mailman/listinfo/mcclim-devel>, <mailto:[email protected]?subject=subscribe> Sender: [email protected] Errors-To: [email protected] X-Spam-Checker-Version: SpamAssassin 3.0.3 (2005-04-27) on clnet X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable version=3.0.3 Lines: 77 Xref: mu list.free-clim:2838 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===-=-=" --===-=-= Content-Type: text/plain; charset=iso-8859-1; format=flowed * 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 --===-=-= Content-Type: text/plain; name=patch-xrender Content-Disposition: inline; filename=patch-xrender 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 --===-=-= Content-Disposition: inline _______________________________________________ mcclim-devel mailing list [email protected] http://common-lisp.net/cgi-bin/mailman/listinfo/mcclim-devel --===-=-=-- --=-=-=-- _______________________________________________ Portable-clx mailing list [email protected] http://lists.metacircles.com/cgi-bin/mailman/listinfo/portable-clx See http://www.cliki.net/clx for darcs URL(s)