Merge pull request #283 from mdaeron/master

v923z · web-flow · commit d62d07ea0b95 · 2021-01-11T20:31:33.000+01:00
Should close #282
diff --git a/code/ndarray.c b/code/ndarray.c
@@ -1554,7 +1554,7 @@ mp_obj_t ndarray_tobytes(mp_obj_t self_in) {
     if(!ndarray_is_dense(self)) {
         mp_raise_ValueError(translate("tobytes can be invoked for dense arrays only"));
     }
-    return mp_obj_new_bytearray_by_ref(self->len, self->array);
+    return mp_obj_new_bytearray_by_ref(self->itemsize * self->len, self->array);
 }
 
 MP_DEFINE_CONST_FUN_OBJ_1(ndarray_tobytes_obj, ndarray_tobytes);
diff --git a/code/ulab.c b/code/ulab.c
@@ -32,7 +32,7 @@
 #include "user/user.h"
 #include "vector/vectorise.h"
 
-#define ULAB_VERSION 1.6.0
+#define ULAB_VERSION 1.6.1
 #define xstr(s) str(s)
 #define str(s) #s
 #if ULAB_NUMPY_COMPATIBILITY
diff --git a/docs/ulab-change-log.md b/docs/ulab-change-log.md
@@ -1,3 +1,9 @@
+Mon, 11 Jan 2021
+
+version 1.6.1
+
+    fix #282
+
 Tue, 24 Nov 2020
 
 version 1.6.0

Original file line number	Diff line number	Diff line change
`@@ -1554,7 +1554,7 @@ mp_obj_t ndarray_tobytes(mp_obj_t self_in) {`
`1554`	`1554`	`if(!ndarray_is_dense(self)) {`
`1555`	`1555`	`mp_raise_ValueError(translate("tobytes can be invoked for dense arrays only"));`
`1556`	`1556`	`}`
`1557`		`- return mp_obj_new_bytearray_by_ref(self->len, self->array);`
	`1557`	`+ return mp_obj_new_bytearray_by_ref(self->itemsize * self->len, self->array);`
`1558`	`1558`	`}`
`1559`	`1559`
`1560`	`1560`	`MP_DEFINE_CONST_FUN_OBJ_1(ndarray_tobytes_obj, ndarray_tobytes);`