Mercurial > pytave
diff python_to_octave.cc @ 102:4e7307dd52a2
Experimental long long support.
| author | David Grundberg <individ@acc.umu.se> |
|---|---|
| date | Mon, 07 May 2012 21:16:27 +0200 |
| parents | 0c19ed1ce349 |
| children | 896fdc369789 |
line wrap: on
line diff
--- a/python_to_octave.cc Mon Apr 09 21:22:32 2012 +0200 +++ b/python_to_octave.cc Mon May 07 21:16:27 2012 +0200 @@ -170,14 +170,15 @@ } switch (type_num) { - ARRAYCASE(PyArray_CHAR, char) - ARRAYCASE(PyArray_UBYTE, unsigned char) - ARRAYCASE(PyArray_SBYTE, signed char) - ARRAYCASE(PyArray_SHORT, signed short) - ARRAYCASE(PyArray_USHORT, unsigned short) - ARRAYCASE(PyArray_INT, signed int) - ARRAYCASE(PyArray_UINT, unsigned int) - ARRAYCASE(PyArray_LONG, signed long) + ARRAYCASE(PyArray_CHAR, char) + ARRAYCASE(PyArray_UBYTE, unsigned char) + ARRAYCASE(PyArray_SBYTE, signed char) + ARRAYCASE(PyArray_SHORT, signed short) + ARRAYCASE(PyArray_USHORT, unsigned short) + ARRAYCASE(PyArray_INT, signed int) + ARRAYCASE(PyArray_UINT, unsigned int) + ARRAYCASE(PyArray_LONG, signed long) + ARRAYCASE(PyArray_LONGLONG, signed long long) /* Commonly Numeric.array(..., Numeric.Float32) */ ARRAYCASE(PyArray_FLOAT, float) @@ -253,6 +254,7 @@ case PyArray_SHORT: case PyArray_INT: case PyArray_LONG: + case PyArray_LONGLONG: switch (pyarr->descr->elsize) { case 1: pyarrobj_to_octvalueNd<int8NDArray>(octvalue, pyarr, dims);