diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-07 10:54:28 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-08-03 06:21:19 +0000 |
commit | 58a93d240c5bdd3bc60ccddbc31676bd0fa2eae3 (patch) | |
tree | 18ad59ef9241a444a2605a73d4300cc65d55158c /sources/shiboken2/tests/libsample | |
parent | 1578d14d1693122d4bcacede0d77527d8e898629 (diff) |
Add numpy support
Add simple array converters giving access to NumPy arrays.
Task-number: PYSIDE-354
Task-number: PYSIDE-516
Change-Id: I2446b0f1ef98eaf12df95e4bd0e03d73e0cd7126
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/shiboken2/tests/libsample')
-rw-r--r-- | sources/shiboken2/tests/libsample/functions.cpp | 20 | ||||
-rw-r--r-- | sources/shiboken2/tests/libsample/functions.h | 2 |
2 files changed, 22 insertions, 0 deletions
diff --git a/sources/shiboken2/tests/libsample/functions.cpp b/sources/shiboken2/tests/libsample/functions.cpp index 9fa4efc37..bf73d5ed7 100644 --- a/sources/shiboken2/tests/libsample/functions.cpp +++ b/sources/shiboken2/tests/libsample/functions.cpp @@ -209,6 +209,26 @@ double sumDoubleArray(double array[4]) return std::accumulate(array, array + 4, double(0)); } +int sumIntMatrix(int m[2][3]) +{ + int result = 0; + for (int r = 0; r < 2; ++r) { + for (int c = 0; c < 3; ++c) + result += m[r][c]; + } + return result; +} + +double sumDoubleMatrix(double m[2][3]) +{ + double result = 0; + for (int r = 0; r < 2; ++r) { + for (int c = 0; c < 3; ++c) + result += m[r][c]; + } + return result; +} + ArrayModifyTest::ArrayModifyTest() { } diff --git a/sources/shiboken2/tests/libsample/functions.h b/sources/shiboken2/tests/libsample/functions.h index 5289d7ce0..a53f97c6e 100644 --- a/sources/shiboken2/tests/libsample/functions.h +++ b/sources/shiboken2/tests/libsample/functions.h @@ -83,6 +83,8 @@ LIBSAMPLE_API OddBool acceptOddBoolReference(OddBool& x); LIBSAMPLE_API int sumIntArray(int array[4]); LIBSAMPLE_API double sumDoubleArray(double array[4]); +LIBSAMPLE_API int sumIntMatrix(int m[2][3]); +LIBSAMPLE_API double sumDoubleMatrix(double m[2][3]); class LIBSAMPLE_API ArrayModifyTest { |