diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2010-04-23 17:53:32 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2010-04-23 17:53:32 -0400 |
| commit | 990443e5f282ad61de00dcf1ebff9cf1d5bc2d70 (patch) | |
| tree | 4456866f31b6b67af1fc5c3769ac2daaa60213b7 | |
| parent | 187454c595559ce48d072fee6bccb51f3de283d4 (diff) | |
Remove lock_instance()
| -rw-r--r-- | src/hb-font.cc | 2 | ||||
| -rw-r--r-- | src/hb-open-type-private.hh | 4 | ||||
| -rw-r--r-- | src/hb-ot-layout.cc | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/hb-font.cc b/src/hb-font.cc index 5e4e02c..4fdb569 100644 --- a/src/hb-font.cc +++ b/src/hb-font.cc @@ -227,7 +227,7 @@ _hb_face_get_table_from_blob (hb_tag_t tag, void *user_data) { hb_face_t *face = (hb_face_t *) user_data; - const OpenTypeFontFile &ot_file = Sanitizer<OpenTypeFontFile>::lock_instance (face->blob); + const OpenTypeFontFile &ot_file = *CastP<OpenTypeFontFile> (hb_blob_lock (face->blob)); const OpenTypeFontFace &ot_face = ot_file.get_face (face->index); const OpenTypeTable &table = ot_face.get_table_by_tag (tag); diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh index daf0c40..ccd26dc 100644 --- a/src/hb-open-type-private.hh +++ b/src/hb-open-type-private.hh @@ -332,10 +332,6 @@ struct Sanitizer return hb_blob_create_empty (); } } - - static const Type& lock_instance (hb_blob_t *blob) { - return *CastP<Type> (hb_blob_lock (blob)); - } }; diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index 96a0d9a..757722b 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc @@ -47,13 +47,13 @@ _hb_ot_layout_init (hb_face_t *face) memset (layout, 0, sizeof (*layout)); layout->gdef_blob = Sanitizer<GDEF>::sanitize (hb_face_get_table (face, HB_OT_TAG_GDEF)); - layout->gdef = &Sanitizer<GDEF>::lock_instance (layout->gdef_blob); + layout->gdef = CastP<GDEF> (hb_blob_lock (layout->gdef_blob)); layout->gsub_blob = Sanitizer<GSUB>::sanitize (hb_face_get_table (face, HB_OT_TAG_GSUB)); - layout->gsub = &Sanitizer<GSUB>::lock_instance (layout->gsub_blob); + layout->gsub = CastP<GSUB> (hb_blob_lock (layout->gsub_blob)); layout->gpos_blob = Sanitizer<GPOS>::sanitize (hb_face_get_table (face, HB_OT_TAG_GPOS)); - layout->gpos = &Sanitizer<GPOS>::lock_instance (layout->gpos_blob); + layout->gpos = CastP<GPOS> (hb_blob_lock (layout->gpos_blob)); } void |