archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

remove mathutils internal variable for storing pointers to each matrix row, instead use macros to access row/column's.

Browse Source 
also add an assert so invalid index access will raise an error in debug mode, without this it was quite easy to access invalid memory without meaning to.

no functional change.
This commit is contained in:
Campbell Barton
2011-12-19 03:12:10 +00:00
parent d0aa012b0a
commit c3675c0e90
3 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/python/mathutils/mathutils_Matrix.h
View File

@@ -38,9 +38,23 @@ extern PyTypeObject matrix_Type;
#define MatrixObject_Check(_v) PyObject_TypeCheck((_v), &matrix_Type)
#define MATRIX_MAX_DIM 4
/* to remove pymat->matrix[row][col] */
#ifdef DEBUG
# define MATRIX_ASSERT(_mat, _row, _col) (BLI_assert(_row < (_mat)->row_size && _col < (_mat)->col_size))
#else
# define MATRIX_ASSERT(_mat, _row, _col) (void)0
#endif
#define MATRIX_ITEM_INDEX(_mat, _row, _col) (MATRIX_ASSERT(_mat, _row, _col), (((_mat)->col_size * (_row)) + (_col)))
#define MATRIX_ITEM_PTR( _mat, _row, _col) ((_mat)->contigPtr + MATRIX_ITEM_INDEX(_mat, _row, _col))
#define MATRIX_ITEM( _mat, _row, _col) ((_mat)->contigPtr [MATRIX_ITEM_INDEX(_mat, _row, _col)])
#define MATRIX_ROW_INDEX(_mat, _row) (MATRIX_ITEM_INDEX(_mat, _row, 0))
#define MATRIX_ROW_PTR( _mat, _row) ((_mat)->contigPtr + MATRIX_ROW_INDEX(_mat, _row))
typedef struct {
BASE_MATH_MEMBERS(contigPtr);
float *matrix[MATRIX_MAX_DIM]; /* ptr to the contigPtr (accessor) */
unsigned short row_size;
unsigned short col_size;
} MatrixObject;