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

minor, reuse StructAtOffset logic in StructAtOffsetOrNull

This commit is contained in:
Ebrahim Byagowi 2019-06-28 23:44:14 +04:30 committed by GitHub
parent 9db7ce73d7
commit ddd29e5594
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hb-ot-cff-common.hh
View File

@ -40,14 +40,14 @@ using namespace OT;
/* utility macro */ /* utility macro */
template<typename Type> template<typename Type>
static inline const Type& StructAtOffsetOrNull(const void *P, unsigned int offset) static inline const Type& StructAtOffsetOrNull (const void *P, unsigned int offset)
{ return offset? (* reinterpret_cast<const Type*> ((const char *) P + offset)): Null(Type); } { return offset ? StructAtOffset<Type> (P, offset) : Null (Type); }
inline unsigned int calcOffSize(unsigned int dataSize) inline unsigned int calcOffSize (unsigned int dataSize)
{ {
unsigned int size = 1; unsigned int size = 1;
unsigned int offset = dataSize + 1; unsigned int offset = dataSize + 1;
while ((offset & ~0xFF) != 0) while (offset & ~0xFF)
{ {
size++; size++;
offset >>= 8; offset >>= 8;
@ -58,8 +58,8 @@ inline unsigned int calcOffSize(unsigned int dataSize)
struct code_pair_t struct code_pair_t
{ {
hb_codepoint_t code; hb_codepoint_t code;
hb_codepoint_t glyph; hb_codepoint_t glyph;
}; };
typedef hb_vector_t<unsigned char> str_buff_t; typedef hb_vector_t<unsigned char> str_buff_t;