projects
/
platform
/
upstream
/
harfbuzz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 0.9.12
[platform/upstream/harfbuzz.git]
/
src
/
hb-ot-head-table.hh
diff --git
a/src/hb-ot-head-table.hh
b/src/hb-ot-head-table.hh
index
bf2d245
..
3a94512
100644
(file)
--- a/
src/hb-ot-head-table.hh
+++ b/
src/hb-ot-head-table.hh
@@
-32,6
+32,8
@@
#include "hb-open-type-private.hh"
#include "hb-open-type-private.hh"
+namespace OT {
+
/*
* head -- Font Header
/*
* head -- Font Header
@@
-45,12
+47,12
@@
struct head
inline unsigned int get_upem (void) const {
unsigned int upem = unitsPerEm;
inline unsigned int get_upem (void) const {
unsigned int upem = unitsPerEm;
- /* If no valid head table found, assume 1000, which matches typical
y
Type1 usage. */
+ /* If no valid head table found, assume 1000, which matches typical Type1 usage. */
return 16 <= upem && upem <= 16384 ? upem : 1000;
}
inline bool sanitize (hb_sanitize_context_t *c) {
return 16 <= upem && upem <= 16384 ? upem : 1000;
}
inline bool sanitize (hb_sanitize_context_t *c) {
- TRACE_SANITIZE ();
+ TRACE_SANITIZE (
this
);
return TRACE_RETURN (c->check_struct (this) && likely (version.major == 1));
}
return TRACE_RETURN (c->check_struct (this) && likely (version.major == 1));
}
@@
-141,5
+143,7
@@
struct head
};
};
+} /* namespace OT */
+
#endif /* HB_OT_HEAD_TABLE_HH */
#endif /* HB_OT_HEAD_TABLE_HH */