From: espen Date: Fri, 1 Jun 2007 06:15:37 +0000 (+0000) Subject: Bug fix X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/commitdiff_plain/110bd96ce6f2ff1aa4f25f899e12a5c3e3125f61?ds=inline Bug fix --- diff --git a/gffi/vectors.lisp b/gffi/vectors.lisp index 082c34c..ad9b461 100644 --- a/gffi/vectors.lisp +++ b/gffi/vectors.lisp @@ -20,7 +20,7 @@ ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -;; $Id: vectors.lisp,v 1.2 2006-06-08 13:24:25 espen Exp $ +;; $Id: vectors.lisp,v 1.3 2007-06-01 06:15:37 espen Exp $ (in-package "GFFI") @@ -411,9 +411,9 @@ (define-type-method copy-function ((type vector0) &key inlined) for element by element-size until (memory-clear-p from-vector element-size element) finally (return length))) - (to-vector (setf - (ref-pointer to offset) - (allocate-memory (* length element-size))))) + (to-vector + (setf (ref-pointer to offset) + (allocate-memory (* (1+ length) element-size))))) (loop repeat length for element by element-size diff --git a/glib/gparam.lisp b/glib/gparam.lisp index 734f0df..6b4bf1b 100644 --- a/glib/gparam.lisp +++ b/glib/gparam.lisp @@ -20,7 +20,7 @@ ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -;; $Id: gparam.lisp,v 1.23 2007-05-10 20:26:33 espen Exp $ +;; $Id: gparam.lisp,v 1.24 2007-06-01 06:18:59 espen Exp $ (in-package "GLIB") @@ -33,7 +33,7 @@ (defbinding (size-of-gvalue "size_of_gvalue") () unsigned-int)) (defconstant +gvalue-size+ (size-of-gvalue)) (defconstant +gvalue-value-offset+ - (max (size-of 'type-number) (type-alignment 'type-number))) + (max (size-of 'type-number) (type-alignment '(unsigned-byte 64)))) (defbinding (%gvalue-init "g_value_init") () nil (value gvalue)