diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2020-04-10 03:54:17 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2020-04-10 03:54:17 +0000 |
commit | 4eb8c3f05b023840db4ad79383d0b59b271f9d0a (patch) | |
tree | 9a8fd91444aab6e9b90187a952bace1582ec9bf5 /Build/source/libs/graphite2/graphite2-src/src/FeatureMap.cpp | |
parent | 503c0227622254c0ae3209a1fa72bcb68bb450bc (diff) |
graphite2 1.3.14
git-svn-id: svn://tug.org/texlive/trunk@54637 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/graphite2/graphite2-src/src/FeatureMap.cpp')
-rw-r--r-- | Build/source/libs/graphite2/graphite2-src/src/FeatureMap.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Build/source/libs/graphite2/graphite2-src/src/FeatureMap.cpp b/Build/source/libs/graphite2/graphite2-src/src/FeatureMap.cpp index e63415dd1c8..014a88fd08e 100644 --- a/Build/source/libs/graphite2/graphite2-src/src/FeatureMap.cpp +++ b/Build/source/libs/graphite2/graphite2-src/src/FeatureMap.cpp @@ -71,7 +71,7 @@ namespace FeatureRef::FeatureRef(const Face & face, unsigned short & bits_offset, uint32 max_val, - uint32 name, uint16 uiName, uint16 flags, + uint32 name, uint16 uiName, flags_t flags, FeatureSetting *settings, uint16 num_set) throw() : m_face(&face), m_nameValues(settings), @@ -79,8 +79,8 @@ FeatureRef::FeatureRef(const Face & face, m_max(max_val), m_id(name), m_nameid(uiName), - m_flags(flags), - m_numSet(num_set) + m_numSet(num_set), + m_flags(flags) { const uint8 need_bits = bit_set_count(m_mask); m_index = (bits_offset + need_bits) / SIZEOF_CHUNK; @@ -163,7 +163,8 @@ bool FeatureMap::readFeats(const Face & face) } ::new (m_feats + i) FeatureRef (face, bits, maxVal, - label, uiName, flags, + label, uiName, + FeatureRef::flags_t(flags), uiSet, num_settings); } new (&m_defaultFeatures) Features(bits/(sizeof(uint32)*8) + 1, *this); |