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

m[algs] Fix BEInt -Wnarrowing errors

This commit is contained in:
Behdad Esfahbod 2021-02-20 15:39:29 -07:00
parent a89d9f25b4
commit ff7bf88192
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/hb-algs.hh
View File

@ -89,7 +89,7 @@ struct BEInt<Type, 1>
{ {
public: public:
BEInt () = default; BEInt () = default;
constexpr BEInt (Type V) : v {V} {} constexpr BEInt (Type V) : v {uint8_t (V)} {}
constexpr operator Type () const { return v; } constexpr operator Type () const { return v; }
private: uint8_t v; private: uint8_t v;
}; };
@ -98,8 +98,8 @@ struct BEInt<Type, 2>
{ {
public: public:
BEInt () = default; BEInt () = default;
constexpr BEInt (Type V) : v {(V >> 8) & 0xFF, constexpr BEInt (Type V) : v {uint8_t ((V >> 8) & 0xFF),
(V ) & 0xFF} {} uint8_t ((V ) & 0xFF)} {}
constexpr operator Type () const constexpr operator Type () const
{ {
#if ((defined(__GNUC__) && __GNUC__ >= 5) || defined(__clang__)) && \ #if ((defined(__GNUC__) && __GNUC__ >= 5) || defined(__clang__)) && \
@ -125,9 +125,9 @@ struct BEInt<Type, 3>
{ {
public: public:
BEInt () = default; BEInt () = default;
constexpr BEInt (Type V) : v {(V >> 16) & 0xFF, constexpr BEInt (Type V) : v {uint8_t ((V >> 16) & 0xFF),
(V >> 8) & 0xFF, uint8_t ((V >> 8) & 0xFF),
(V ) & 0xFF} {} uint8_t ((V ) & 0xFF)} {}
constexpr operator Type () const { return (v[0] << 16) constexpr operator Type () const { return (v[0] << 16)
+ (v[1] << 8) + (v[1] << 8)
+ (v[2] ); } + (v[2] ); }
@ -138,10 +138,10 @@ struct BEInt<Type, 4>
{ {
public: public:
BEInt () = default; BEInt () = default;
constexpr BEInt (Type V) : v {(V >> 24) & 0xFF, constexpr BEInt (Type V) : v {uint8_t ((V >> 24) & 0xFF),
(V >> 16) & 0xFF, uint8_t ((V >> 16) & 0xFF),
(V >> 8) & 0xFF, uint8_t ((V >> 8) & 0xFF),
(V ) & 0xFF} {} uint8_t ((V ) & 0xFF)} {}
constexpr operator Type () const { return (v[0] << 24) constexpr operator Type () const { return (v[0] << 24)
+ (v[1] << 16) + (v[1] << 16)
+ (v[2] << 8) + (v[2] << 8)