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

Minor

This commit is contained in:
Behdad Esfahbod 2018-08-01 22:50:45 -07:00
parent 16ccfafbbd
commit cb1491f92e
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hb-blob-private.hh
View File

@ -57,11 +57,6 @@ struct hb_blob_t
HB_INTERNAL bool try_make_writable_inplace (void); HB_INTERNAL bool try_make_writable_inplace (void);
HB_INTERNAL bool try_make_writable_inplace_unix (void); HB_INTERNAL bool try_make_writable_inplace_unix (void);
inline void lock (void)
{
hb_blob_make_immutable (this);
}
template <typename Type> template <typename Type>
inline const Type* as (void) const inline const Type* as (void) const
{ {

10
src/hb-machinery-private.hh
View File

@ -30,6 +30,8 @@
#define HB_MACHINERY_PRIVATE_HH #define HB_MACHINERY_PRIVATE_HH
#include "hb-private.hh" #include "hb-private.hh"
#include "hb-blob-private.hh"
#include "hb-iter-private.hh" #include "hb-iter-private.hh"
@ -188,7 +190,7 @@ struct hb_sanitize_context_t :
inline void start_processing (void) inline void start_processing (void)
{ {
this->start = hb_blob_get_data (this->blob, nullptr); this->start = this->blob->data;
this->end = this->start + this->blob->length; this->end = this->start + this->blob->length;
assert (this->start <= this->end); /* Must not overflow. */ assert (this->start <= this->end); /* Must not overflow. */
this->max_ops = MAX ((unsigned int) (this->end - this->start) * HB_SANITIZE_MAX_OPS_FACTOR, this->max_ops = MAX ((unsigned int) (this->end - this->start) * HB_SANITIZE_MAX_OPS_FACTOR,
@ -336,7 +338,7 @@ struct hb_sanitize_context_t :
DEBUG_MSG_FUNC (SANITIZE, start, sane ? "PASSED" : "FAILED"); DEBUG_MSG_FUNC (SANITIZE, start, sane ? "PASSED" : "FAILED");
if (sane) if (sane)
{ {
blob->lock (); hb_blob_make_immutable (blob);
return blob; return blob;
} }
else else
@ -350,8 +352,8 @@ struct hb_sanitize_context_t :
inline hb_blob_t *reference_table (const hb_face_t *face, hb_tag_t tableTag = Type::tableTag) inline hb_blob_t *reference_table (const hb_face_t *face, hb_tag_t tableTag = Type::tableTag)
{ {
if (!num_glyphs_set) if (!num_glyphs_set)
set_num_glyphs (face->get_num_glyphs ()); set_num_glyphs (hb_face_get_glyph_count (face));
return sanitize_blob<Type> (face->reference_table (tableTag)); return sanitize_blob<Type> (hb_face_reference_table (face, tableTag));
} }
mutable unsigned int debug_depth; mutable unsigned int debug_depth;