aboutsummaryrefslogtreecommitdiffstats
path: root/src/gmisc
diff options
context:
space:
mode:
Diffstat (limited to 'src/gmisc')
-rw-r--r--src/gmisc/gmisc.h8
-rw-r--r--src/gmisc/gmisc_hittest.c4
-rw-r--r--src/gmisc/gmisc_matrix2d.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/src/gmisc/gmisc.h b/src/gmisc/gmisc.h
index 8d767270..77e41321 100644
--- a/src/gmisc/gmisc.h
+++ b/src/gmisc/gmisc.h
@@ -26,7 +26,7 @@
/*===========================================================================*/
// Forward definition
-typedef struct point point;
+typedef struct gPoint gPoint;
/**
* @brief Sample data formats
@@ -249,7 +249,7 @@ typedef int32_t fixed;
*
* @api
*/
- void gmiscMatrixFloat2DApplyToPoints(point *dst, const point *src, const MatrixFloat2D *m, int cnt);
+ void gmiscMatrixFloat2DApplyToPoints(gPoint *dst, const gPoint *src, const MatrixFloat2D *m, int cnt);
/**
* @brief Set the 2D matrix to the identity matrix
@@ -367,7 +367,7 @@ typedef int32_t fixed;
*
* @api
*/
- void gmiscMatrixFixed2DApplyToPoints(point *dst, const point *src, const MatrixFixed2D *m, int cnt);
+ void gmiscMatrixFixed2DApplyToPoints(gPoint *dst, const gPoint *src, const MatrixFixed2D *m, int cnt);
/**
* @brief Set the 2D matrix to the identity matrix
@@ -476,7 +476,7 @@ typedef int32_t fixed;
*
* @api
*/
- gBool gmiscHittestPoly(const point *pntarray, unsigned cnt, const point *p);
+ gBool gmiscHittestPoly(const gPoint *pntarray, unsigned cnt, const gPoint *p);
#endif // GMISC_NEED_HITTEST_POLY
#endif /* GFX_USE_MISC */
diff --git a/src/gmisc/gmisc_hittest.c b/src/gmisc/gmisc_hittest.c
index 6e977cb2..9b279873 100644
--- a/src/gmisc/gmisc_hittest.c
+++ b/src/gmisc/gmisc_hittest.c
@@ -18,7 +18,7 @@
* the function returns 1. If the point c is on the segment, the function
* returns 0. If they don't intersect, it returns 2.
*/
-static char _pointCrossingSegment(const point *a, const point *b, const point *c) {
+static char _pointCrossingSegment(const gPoint *a, const gPoint *b, const gPoint *c) {
/* If both points are left from our point, it won't intersect */
if (a->x < c->x && b->x < c->x) {
return -1;
@@ -64,7 +64,7 @@ static char _pointCrossingSegment(const point *a, const point *b, const point *c
return -1;
}
-gBool gmiscHittestPoly(const point *pntarray, unsigned cnt, const point *p) {
+gBool gmiscHittestPoly(const gPoint *pntarray, unsigned cnt, const gPoint *p) {
unsigned i = 0;
uint8_t nbrIntersection = 0;
int8_t crossResult;
diff --git a/src/gmisc/gmisc_matrix2d.c b/src/gmisc/gmisc_matrix2d.c
index 352afbe7..ad792ca0 100644
--- a/src/gmisc/gmisc_matrix2d.c
+++ b/src/gmisc/gmisc_matrix2d.c
@@ -91,7 +91,7 @@ void gmiscMatrixFloat2DApplyRotation(MatrixFloat2D *dst, const MatrixFloat2D *sr
}
}
-void gmiscMatrixFloat2DApplyToPoints(point *dst, const point *src, const MatrixFloat2D *m, int cnt) {
+void gmiscMatrixFloat2DApplyToPoints(gPoint *dst, const gPoint *src, const MatrixFloat2D *m, int cnt) {
float x;
for( ;cnt--; dst++, src++) {
@@ -177,7 +177,7 @@ void gmiscMatrixFixed2DApplyShear(MatrixFixed2D *dst, const MatrixFixed2D *src,
}
#endif
-void gmiscMatrixFixed2DApplyToPoints(point *dst, const point *src, const MatrixFixed2D *m, int cnt) {
+void gmiscMatrixFixed2DApplyToPoints(gPoint *dst, const gPoint *src, const MatrixFixed2D *m, int cnt) {
coord_t x;
for( ;cnt--; dst++, src++) {