diff options
| author | Determinant <ted.sybil@gmail.com> | 2015-12-10 21:46:11 +0800 |
|---|---|---|
| committer | Determinant <ted.sybil@gmail.com> | 2015-12-10 21:46:11 +0800 |
| commit | 1b0f2ab768e34f126ce946e1689cd47c86f41645 (patch) | |
| tree | 66d9d3cdf812a2e69e0caab4accbe762266d48b9 /nerv/lib/matrix/generic/elem_type.h | |
| parent | 154403fe38babd804b8e34fd1ae78afca5973ed7 (diff) | |
fix the bug in freeing submatrix; add `offset` to Matrix structurebugfix-matrixfree
Diffstat (limited to 'nerv/lib/matrix/generic/elem_type.h')
| -rw-r--r-- | nerv/lib/matrix/generic/elem_type.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/nerv/lib/matrix/generic/elem_type.h b/nerv/lib/matrix/generic/elem_type.h index bffe940..07f6355 100644 --- a/nerv/lib/matrix/generic/elem_type.h +++ b/nerv/lib/matrix/generic/elem_type.h @@ -1,22 +1,29 @@ +#define MATRIX_ELEM_PTR_F(self) ((float *)((char *)((self)->data.f) + (self)->offset)) +#define MATRIX_ELEM_PTR_D(self) ((double *)((char *)((self)->data.d) + (self)->offset)) +#define MATRIX_ELEM_PTR_I(self) ((long *)((char *)((self)->data.i) + (self)->offset)) + #ifdef MATRIX_USE_FLOAT #define MATRIX_ELEM float #define MATRIX_ELEM_FMT "%f" #define MATRIX_ELEM_WRITE_FMT "%.8f" -#define MATRIX_ELEM_PTR(self) ((self)->data.f) +#define MATRIX_ELEM_PTR(self) MATRIX_ELEM_PTR_F(self) +#define MATRIX_ELEM_PTR_BASE(self) ((self)->data.f) #elif defined(MATRIX_USE_DOUBLE) #define MATRIX_ELEM double #define MATRIX_ELEM_FMT "%lf" #define MATRIX_ELEM_WRITE_FMT "%.8lf" -#define MATRIX_ELEM_PTR(self) ((self)->data.d) +#define MATRIX_ELEM_PTR(self) MATRIX_ELEM_PTR_D(self) +#define MATRIX_ELEM_PTR_BASE(self) ((self)->data.d) #elif defined(MATRIX_USE_INT) #define MATRIX_ELEM long #define MATRIX_ELEM_FMT "%ld" #define MATRIX_ELEM_WRITE_FMT "%ld" -#define MATRIX_ELEM_PTR(self) ((self)->data.i) +#define MATRIX_ELEM_PTR(self) MATRIX_ELEM_PTR_I(self) +#define MATRIX_ELEM_PTR_BASE(self) ((self)->data.i) #endif |