diff options
Diffstat (limited to 'Build/source/libs/graphite2/graphite2-src/src/gr_features.cpp')
-rw-r--r-- | Build/source/libs/graphite2/graphite2-src/src/gr_features.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Build/source/libs/graphite2/graphite2-src/src/gr_features.cpp b/Build/source/libs/graphite2/graphite2-src/src/gr_features.cpp index 38cebb7b5db..30c5c1099b6 100644 --- a/Build/source/libs/graphite2/graphite2-src/src/gr_features.cpp +++ b/Build/source/libs/graphite2/graphite2-src/src/gr_features.cpp @@ -80,14 +80,14 @@ gr_int16 gr_fref_value(const gr_feature_ref* pfeatureref, gr_uint16 settingno) void* gr_fref_label(const gr_feature_ref* pfeatureref, gr_uint16 *langId, gr_encform utf, gr_uint32 *length) { - if(!pfeatureref || !pfeatureref->getFace()) + if(!pfeatureref) { langId = 0; length = 0; return NULL; } uint16 label = pfeatureref->getNameId(); - NameTable * names = pfeatureref->getFace()->nameTable(); + NameTable * names = pfeatureref->getFace().nameTable(); if (!names) { langId = 0; @@ -101,14 +101,14 @@ void* gr_fref_label(const gr_feature_ref* pfeatureref, gr_uint16 *langId, gr_enc void* gr_fref_value_label(const gr_feature_ref*pfeatureref, gr_uint16 setting, gr_uint16 *langId, gr_encform utf, gr_uint32 *length) { - if(!pfeatureref || (setting >= pfeatureref->getNumSettings()) || !pfeatureref->getFace()) + if(!pfeatureref || (setting >= pfeatureref->getNumSettings())) { langId = 0; length = 0; return NULL; } uint16 label = pfeatureref->getSettingName(setting); - NameTable * names = pfeatureref->getFace()->nameTable(); + NameTable * names = pfeatureref->getFace().nameTable(); if (!names) { langId = 0; @@ -131,7 +131,7 @@ gr_feature_val* gr_featureval_clone(const gr_feature_val* pfeatures/*may be NULL void gr_featureval_destroy(gr_feature_val *p) { - delete p; + delete static_cast<Features*>(p); } |