diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-11-03 10:51:23 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-11-03 10:51:23 +1000 |
commit | 7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d (patch) | |
tree | 95cf152ef65ff19c7b2515b427bbe86b92b611d0 /src/gmisc | |
parent | 8bd70d953bcd3e32ceb4e45a4e561c973726280a (diff) | |
download | uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.tar.gz uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.tar.bz2 uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.zip |
For all source files update integer types to the new gI8 etc type names
Diffstat (limited to 'src/gmisc')
-rw-r--r-- | src/gmisc/gmisc.h | 16 | ||||
-rw-r--r-- | src/gmisc/gmisc_arrayops.c | 6 | ||||
-rw-r--r-- | src/gmisc/gmisc_hittest.c | 4 | ||||
-rw-r--r-- | src/gmisc/gmisc_trig.c | 4 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/gmisc/gmisc.h b/src/gmisc/gmisc.h index 411cbb02..2cfd04bf 100644 --- a/src/gmisc/gmisc.h +++ b/src/gmisc/gmisc.h @@ -57,7 +57,7 @@ typedef enum ArrayDataFormat_e { * @brief The type for a fixed point type. * @details The top 16 bits are the integer component, the bottom 16 bits are the real component. */ -typedef int32_t fixed; +typedef gI32 fixed; /** * @brief Macros to convert to and from a fixed point. @@ -112,20 +112,20 @@ typedef int32_t fixed; * * @api */ - void gmiscArrayConvert(ArrayDataFormat srcfmt, void *src, ArrayDataFormat dstfmt, void *dst, size_t cnt); + void gmiscArrayConvert(ArrayDataFormat srcfmt, void *src, ArrayDataFormat dstfmt, void *dst, gMemSize cnt); #if 0 - void gmiscArrayTranslate(ArrayDataFormat fmt, void *src, void *dst, size_t cnt, int trans); + void gmiscArrayTranslate(ArrayDataFormat fmt, void *src, void *dst, gMemSize cnt, int trans); - void gmiscArrayMultiply(ArrayDataFormat fmt, void *src, void *dst, size_t cnt, int mult); + void gmiscArrayMultiply(ArrayDataFormat fmt, void *src, void *dst, gMemSize cnt, int mult); - void gmiscArrayDivide(ArrayDataFormat fmt, void *src, void *dst, size_t cnt, int mdiv); + void gmiscArrayDivide(ArrayDataFormat fmt, void *src, void *dst, gMemSize cnt, int mdiv); - void gmiscArrayMultDiv(ArrayDataFormat fmt, void *src, void *dst, size_t cnt, int mult, int div); + void gmiscArrayMultDiv(ArrayDataFormat fmt, void *src, void *dst, gMemSize cnt, int mult, int div); - void gmiscArrayAdd(ArrayDataFormat fmt, void *src1, void *src2, void *dst, size_t cnt); + void gmiscArrayAdd(ArrayDataFormat fmt, void *src1, void *src2, void *dst, gMemSize cnt); - void gmiscArrayAddNoOverflow(ArrayDataFormat fmt, void *src1, void *src2, void *dst, size_t cnt); + void gmiscArrayAddNoOverflow(ArrayDataFormat fmt, void *src1, void *src2, void *dst, gMemSize cnt); #endif #endif diff --git a/src/gmisc/gmisc_arrayops.c b/src/gmisc/gmisc_arrayops.c index d159a58d..824ef35c 100644 --- a/src/gmisc/gmisc_arrayops.c +++ b/src/gmisc/gmisc_arrayops.c @@ -9,9 +9,9 @@ #if GFX_USE_GMISC && GMISC_NEED_ARRAYOPS -void gmiscArrayConvert(ArrayDataFormat srcfmt, void *src, ArrayDataFormat dstfmt, void *dst, size_t cnt) { - uint8_t *src8, *dst8; - uint16_t *src16, *dst16; +void gmiscArrayConvert(ArrayDataFormat srcfmt, void *src, ArrayDataFormat dstfmt, void *dst, gMemSize cnt) { + gU8 *src8, *dst8; + gU16 *src16, *dst16; dst8 = dst; dst16 = dst; diff --git a/src/gmisc/gmisc_hittest.c b/src/gmisc/gmisc_hittest.c index b3c21e26..826b3a78 100644 --- a/src/gmisc/gmisc_hittest.c +++ b/src/gmisc/gmisc_hittest.c @@ -66,8 +66,8 @@ static char _pointCrossingSegment(const gPoint *a, const gPoint *b, const gPoint gBool gmiscHittestPoly(const gPoint *pntarray, unsigned cnt, const gPoint *p) { unsigned i = 0; - uint8_t nbrIntersection = 0; - int8_t crossResult; + gU8 nbrIntersection = 0; + gI8 crossResult; // For each pair of points for (i = 0; i < cnt-1; i++) { diff --git a/src/gmisc/gmisc_trig.c b/src/gmisc/gmisc_trig.c index 7d18cf2e..451c408b 100644 --- a/src/gmisc/gmisc_trig.c +++ b/src/gmisc/gmisc_trig.c @@ -144,7 +144,7 @@ } #else float invsqrt(float n) { - int32_t i; + gI32 i; float x2; x2 = n * 0.5F; @@ -156,7 +156,7 @@ ((char *)&i)[2] = ((char *)&n)[1]; ((char *)&i)[3] = ((char *)&n)[0]; #else - i = *(int32_t *)&n; + i = *(gI32 *)&n; #endif // evil floating point bit level hacking |