diff options
Diffstat (limited to 'src/libnr/nr-macros.h')
| -rw-r--r-- | src/libnr/nr-macros.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/libnr/nr-macros.h b/src/libnr/nr-macros.h index 0ccad30c4..e0d3dabfb 100644 --- a/src/libnr/nr-macros.h +++ b/src/libnr/nr-macros.h @@ -47,22 +47,12 @@ #define NR_DF_TEST_CLOSE(a,b,e) (fabs ((a) - (b)) <= (e)) // Todo: move these into nr-matrix.h -#define NR_MATRIX_DF_TEST_TRANSFORM_CLOSE(a,b,e) (NR_DF_TEST_CLOSE ((*(a))[0], (*(b))[0], e) && \ - NR_DF_TEST_CLOSE ((*(a))[1], (*(b))[1], e) && \ - NR_DF_TEST_CLOSE ((*(a))[2], (*(b))[2], e) && \ - NR_DF_TEST_CLOSE ((*(a))[3], (*(b))[3], e)) -#define NR_MATRIX_DF_TEST_TRANSLATE_CLOSE(a,b,e) (NR_DF_TEST_CLOSE ((*(a))[4], (*(b))[4], e) && \ - NR_DF_TEST_CLOSE ((*(a))[5], (*(b))[5], e)) -#define NR_MATRIX_DF_TEST_CLOSE(a,b,e) (NR_MATRIX_DF_TEST_TRANSLATE_CLOSE (a, b, e) && \ - NR_MATRIX_DF_TEST_TRANSFORM_CLOSE (a, b, e)) - #define NR_RECT_DFLS_TEST_EMPTY(a) (((a)->x0 >= (a)->x1) || ((a)->y0 >= (a)->y1)) #define NR_RECT_DFLS_TEST_INTERSECT(a,b) (((a)->x0 < (b)->x1) && ((a)->x1 > (b)->x0) && ((a)->y0 < (b)->y1) && ((a)->y1 > (b)->y0)) #define NR_RECT_DF_POINT_DF_TEST_INSIDE(r,p) (((p)->x >= (r)->x0) && ((p)->x < (r)->x1) && ((p)->y >= (r)->y0) && ((p)->y < (r)->y1)) #define NR_RECT_LS_POINT_LS_TEST_INSIDE(r,p) (((p)->x >= (r)->x0) && ((p)->x < (r)->x1) && ((p)->y >= (r)->y0) && ((p)->y < (r)->y1)) #define NR_RECT_LS_TEST_INSIDE(r,x,y) ((x >= (r)->x0) && (x < (r)->x1) && (y >= (r)->y0) && (y < (r)->y1)) -#define NR_MATRIX_D_TO_DOUBLE(m) ((m)->c) -#define NR_MATRIX_D_FROM_DOUBLE(d) ((NRMatrix *) &(d)[0]) +#define NR_MATRIX_D_FROM_DOUBLE(d) ((NR::Matrix *) &(d)[0]) #endif |