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

Remove HB_TAG_CHAR4

This commit is contained in:
Behdad Esfahbod 2017-10-31 15:30:06 -06:00
parent d016c5bdb9
commit 8eaff980fc
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-common.cc
View File

@ -85,7 +85,7 @@ hb_tag_from_string (const char *str, int len)
for (; i < 4; i++)
tag[i] = ' ';
return HB_TAG_CHAR4 (tag);
return HB_TAG (tag[0], tag[1], tag[2], tag[3]);
}
/**

2
src/hb-ot-tag.cc
View File

@ -925,7 +925,7 @@ hb_ot_tag_from_language (hb_language_t language)
if (i) {
for (; i < 4; i++)
tag[i] = ' ';
return HB_TAG_CHAR4 (tag);
return HB_TAG (tag[0], tag[1], tag[2], tag[3]);
}
}

5
src/hb-private.hh
View File

@ -646,11 +646,6 @@ static inline unsigned char TOUPPER (unsigned char c)
static inline unsigned char TOLOWER (unsigned char c)
{ return (c >= 'A' && c <= 'Z') ? c - 'A' + 'a' : c; }
#define HB_TAG_CHAR4(s) (HB_TAG(((const char *) s)[0], \
((const char *) s)[1], \
((const char *) s)[2], \
((const char *) s)[3]))
/* C++ helpers */