AuroraMiddleware/harfbuzz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use float in avar calculation instead ints and checking their overflows

Browse Source
This commit is contained in:
Ebrahim Byagowi 2020-04-16 21:25:32 +04:30
parent 9ffa50fe5d
commit 818f109bde
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hb-algs.hh
View File

@ -645,18 +645,6 @@ hb_unsigned_mul_overflows (unsigned int count, unsigned int size)
return (size > 0) && (count >= ((unsigned int) -1) / size);
}
static inline bool
hb_int_mul_overflows (int x, int y, int &result)
{
#if __has_builtin(__builtin_mul_overflow)
return __builtin_mul_overflow (x, y, &result);
#else
int64_t sink = (int64_t) x * y;
result = sink;
return result != sink;
#endif
}
/*
* Sort and search.

9
src/hb-ot-var-avar-table.hh
View File

@ -89,14 +89,9 @@ struct SegmentMaps : ArrayOf<AxisValueMap>
if (unlikely (arrayZ[i-1].fromCoord == arrayZ[i].fromCoord))
return arrayZ[i-1].toCoord;
int factor;
if (unlikely (hb_int_mul_overflows (arrayZ[i].toCoord - arrayZ[i-1].toCoord,
value - arrayZ[i-1].fromCoord,
factor)))
return arrayZ[i-1].toCoord;
int denom = arrayZ[i].fromCoord - arrayZ[i-1].fromCoord;
return arrayZ[i-1].toCoord + (factor + denom/2) / denom;
return roundf (arrayZ[i-1].toCoord + ((float) (arrayZ[i].toCoord - arrayZ[i-1].toCoord) *
(value - arrayZ[i-1].fromCoord)) / denom);
#undef toCoord
#undef fromCoord
}

4
src/hb.hh
View File

@ -219,10 +219,6 @@ extern "C" void hb_free_impl(void *ptr);
* Compiler attributes
*/
#ifndef __has_builtin
# define __has_builtin(x) 0
#endif
#if (defined(__GNUC__) || defined(__clang__)) && defined(__OPTIMIZE__)
#define likely(expr) (__builtin_expect (!!(expr), 1))
#define unlikely(expr) (__builtin_expect (!!(expr), 0))