bknr-cvs

Download

bknr-cvs@common-lisp.net

September 2010

1 participants
12 discussions

[bknr-cvs] manuel changed trunk/thirdparty/cl-gd/
by BKNR Commits 13 Sep '10

13 Sep '10

Revision: 4605 Author: manuel URL: http://bknr.net/trac/changeset/4605 cl-gd fixes zum laufen auf 64bit openmcl, *cough* U trunk/thirdparty/cl-gd/Makefile U trunk/thirdparty/cl-gd/gd-uffi.lisp U trunk/thirdparty/cl-gd/misc.lisp Modified: trunk/thirdparty/cl-gd/Makefile =================================================================== --- trunk/thirdparty/cl-gd/Makefile 2010-09-13 15:22:30 UTC (rev 4604) +++ trunk/thirdparty/cl-gd/Makefile 2010-09-13 19:58:06 UTC (rev 4605) @@ -8,4 +8,… [View More]4 @@ # this should work for Mac OS X cl-gd-glue.dylib: - gcc -arch i386 -lgd -lpng -lz -lfreetype -ljpeg -dynamiclib cl-gd-glue.c -o cl-gd-glue.dylib -I/opt/local/include -L/opt/local/lib + gcc -arch i386 -arch x86_64 -lgif -lgd -lpng -lz -lfreetype -ljpeg -dynamiclib cl-gd-glue.c -o cl-gd-glue.dylib -I/opt/local/include -L/opt/local/lib Modified: trunk/thirdparty/cl-gd/gd-uffi.lisp =================================================================== --- trunk/thirdparty/cl-gd/gd-uffi.lisp 2010-09-13 15:22:30 UTC (rev 4604) +++ trunk/thirdparty/cl-gd/gd-uffi.lisp 2010-09-13 19:58:06 UTC (rev 4605) @@ -35,7 +35,7 @@ (sx :int) (sy :int) (colors-total :int) - (red (:array :int #.+max-colors+)) + (red (:array :int #.+max-colors+) :offset 20) (green (:array :int #.+max-colors+)) (blue (:array :int #.+max-colors+)) (open (:array :int #.+max-colors+)) @@ -74,6 +74,12 @@ (cx2 :int) (cy2 :int)) +;; XXX evil hack +#+(and :openmcl :64-bit-target) +(defmethod cffi::foreign-type-alignment ((type uffi-array-type)) + 4) + + (def-type pixels-array (* (* :unsigned-char))) (def-type pixels-row (* :unsigned-char)) (def-type t-pixels-array (* (* :int))) Modified: trunk/thirdparty/cl-gd/misc.lisp =================================================================== --- trunk/thirdparty/cl-gd/misc.lisp 2010-09-13 15:22:30 UTC (rev 4604) +++ trunk/thirdparty/cl-gd/misc.lisp 2010-09-13 19:58:06 UTC (rev 4605) @@ -220,12 +220,12 @@ (let ((,raw-pixels (get-slot-value ,img 'gd-image 'pixels))) (declare (type pixels-array ,raw-pixels)) (dotimes (,y-var ,height) - (let ((,row (deref-array ,raw-pixels '(:array (* :unsigned-char)) ,y-var))) + (let ((,row (deref-array ,raw-pixels '(:array (* :unsigned-byte)) ,y-var))) (declare (type pixels-row ,row)) (macrolet ((do-pixels-in-row ((,x-var) &body ,inner-body) `(dotimes (,,x-var ,',width) (macrolet ((raw-pixel () - `(deref-array ,',',row '(:array :unsigned-char) ,',,x-var))) + `(deref-array ,',',row '(:array :unsigned-byte) ,',,x-var))) (locally ,@,inner-body))))) (locally [View Less]

1 0

[bknr-cvs] manuel changed trunk/thirdparty/cl
by BKNR Commits 13 Sep '10

13 Sep '10

Revision: 4604 Author: manuel URL: http://bknr.net/trac/changeset/4604 added cl-paypal as thirdparty U trunk/thirdparty/cl-gd/Makefile A trunk/thirdparty/cl-paypal/ A trunk/thirdparty/cl-paypal/.git/ A trunk/thirdparty/cl-paypal/.git/FETCH_HEAD A trunk/thirdparty/cl-paypal/.git/HEAD A trunk/thirdparty/cl-paypal/.git/ORIG_HEAD A trunk/thirdparty/cl-paypal/.git/config A trunk/thirdparty/cl-paypal/.git/description A trunk/thirdparty/cl-paypal/.git/hooks/ A trunk/thirdparty/cl-… [View More]paypal/.git/hooks/applypatch-msg.sample A trunk/thirdparty/cl-paypal/.git/hooks/commit-msg.sample A trunk/thirdparty/cl-paypal/.git/hooks/post-commit.sample A trunk/thirdparty/cl-paypal/.git/hooks/post-receive.sample A trunk/thirdparty/cl-paypal/.git/hooks/post-update.sample A trunk/thirdparty/cl-paypal/.git/hooks/pre-applypatch.sample A trunk/thirdparty/cl-paypal/.git/hooks/pre-commit.sample A trunk/thirdparty/cl-paypal/.git/hooks/pre-rebase.sample A trunk/thirdparty/cl-paypal/.git/hooks/prepare-commit-msg.sample A trunk/thirdparty/cl-paypal/.git/hooks/update.sample A trunk/thirdparty/cl-paypal/.git/index A trunk/thirdparty/cl-paypal/.git/info/ A trunk/thirdparty/cl-paypal/.git/info/exclude A trunk/thirdparty/cl-paypal/.git/logs/ A trunk/thirdparty/cl-paypal/.git/logs/HEAD A trunk/thirdparty/cl-paypal/.git/logs/refs/ A trunk/thirdparty/cl-paypal/.git/logs/refs/heads/ A trunk/thirdparty/cl-paypal/.git/logs/refs/heads/develop A trunk/thirdparty/cl-paypal/.git/logs/refs/heads/master A trunk/thirdparty/cl-paypal/.git/logs/refs/remotes/ A trunk/thirdparty/cl-paypal/.git/logs/refs/remotes/writable/ A trunk/thirdparty/cl-paypal/.git/logs/refs/remotes/writable/develop A trunk/thirdparty/cl-paypal/.git/logs/refs/remotes/writable/master A trunk/thirdparty/cl-paypal/.git/objects/ A trunk/thirdparty/cl-paypal/.git/objects/info/ A trunk/thirdparty/cl-paypal/.git/objects/pack/ A trunk/thirdparty/cl-paypal/.git/objects/pack/pack-292beccc94f53561e5d52fadd53a6305bff95943.idx A trunk/thirdparty/cl-paypal/.git/objects/pack/pack-292beccc94f53561e5d52fadd53a6305bff95943.pack A trunk/thirdparty/cl-paypal/.git/packed-refs A trunk/thirdparty/cl-paypal/.git/refs/ A trunk/thirdparty/cl-paypal/.git/refs/heads/ A trunk/thirdparty/cl-paypal/.git/refs/heads/develop A trunk/thirdparty/cl-paypal/.git/refs/heads/master A trunk/thirdparty/cl-paypal/.git/refs/remotes/ A trunk/thirdparty/cl-paypal/.git/refs/remotes/origin/ A trunk/thirdparty/cl-paypal/.git/refs/remotes/origin/HEAD A trunk/thirdparty/cl-paypal/.git/refs/remotes/writable/ A trunk/thirdparty/cl-paypal/.git/refs/remotes/writable/develop A trunk/thirdparty/cl-paypal/.git/refs/remotes/writable/master A trunk/thirdparty/cl-paypal/.git/refs/tags/ A trunk/thirdparty/cl-paypal/DOC/ A trunk/thirdparty/cl-paypal/DOC/PP_ExpressCheckout_IntegrationGuide.pdf A trunk/thirdparty/cl-paypal/README A trunk/thirdparty/cl-paypal/cl-paypal-test.lisp A trunk/thirdparty/cl-paypal/cl-paypal.asd A trunk/thirdparty/cl-paypal/cl-paypal.lisp A trunk/thirdparty/cl-paypal/config.lisp A trunk/thirdparty/cl-paypal/package.lisp U trunk/thirdparty/closure-common/.git/FETCH_HEAD U trunk/thirdparty/closure-common/.git/ORIG_HEAD U trunk/thirdparty/closure-common/.git/index U trunk/thirdparty/closure-common/.git/logs/HEAD U trunk/thirdparty/closure-common/.git/logs/refs/heads/master U trunk/thirdparty/closure-common/.git/logs/refs/remotes/origin/master U trunk/thirdparty/closure-common/.git/refs/heads/master U trunk/thirdparty/closure-common/.git/refs/remotes/origin/master U trunk/thirdparty/closure-common/dist.sh U trunk/thirdparty/closure-common/ystream.lisp Change set too large, please see URL above [View Less]

1 0