Aric Stewart : usp10: Change OpenType_GSUB_GetFontFeatureTags to OpenType_GetFontFeatureTags and load features from GPOS table .
Alexandre Julliard
julliard at winehq.org
Mon Jul 16 14:14:30 CDT 2012
Module: wine
Branch: master
Commit: 84b8dbfa8a2364000df9c2ad174e697c1f3d3c62
URL: http://source.winehq.org/git/wine.git/?a=commit;h=84b8dbfa8a2364000df9c2ad174e697c1f3d3c62
Author: Aric Stewart <aric at codeweavers.com>
Date: Mon Jul 16 07:23:46 2012 -0500
usp10: Change OpenType_GSUB_GetFontFeatureTags to OpenType_GetFontFeatureTags and load features from GPOS table.
---
dlls/usp10/opentype.c | 78 ++++++++++++++++++++++++++++++++++++++++--
dlls/usp10/shape.c | 6 ++--
dlls/usp10/usp10_internal.h | 2 +-
3 files changed, 78 insertions(+), 8 deletions(-)
diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c
index 369cfcc..fa160b7 100644
--- a/dlls/usp10/opentype.c
+++ b/dlls/usp10/opentype.c
@@ -1153,7 +1153,7 @@ static void GSUB_initialize_feature_cache(LPCVOID table, LoadedLanguage *languag
{
int i;
- if (!language->feature_count && language->gsub_table)
+ if (language->gsub_table)
{
const OT_LangSys *lang = language->gsub_table;
const GSUB_Header *header = (const GSUB_Header *)table;
@@ -1186,7 +1186,77 @@ static void GSUB_initialize_feature_cache(LPCVOID table, LoadedLanguage *languag
}
}
-HRESULT OpenType_GSUB_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature)
+static void GPOS_expand_feature_cache(LPCVOID table, LoadedLanguage *language)
+{
+ int i, count;
+ const OT_LangSys *lang = language->gpos_table;
+ const GPOS_Header *header = (const GPOS_Header *)table;
+ const OT_FeatureList *feature_list;
+
+ if (!lang)
+ return;
+
+ count = GET_BE_WORD(lang->FeatureCount);
+ feature_list = (const OT_FeatureList*)((const BYTE*)header + GET_BE_WORD(header->FeatureList));
+
+ TRACE("%i features\n",count);
+ if (!language->feature_count)
+ {
+ language->feature_count = count;
+
+ if (language->feature_count)
+ {
+ language->features = HeapAlloc(GetProcessHeap(),0,sizeof(LoadedFeature)*language->feature_count);
+
+ for (i = 0; i < language->feature_count; i++)
+ {
+ const OT_Feature *feature;
+ int j;
+ int index = GET_BE_WORD(lang->FeatureIndex[i]);
+
+ language->features[i].tag = MS_MAKE_TAG(feature_list->FeatureRecord[index].FeatureTag[0], feature_list->FeatureRecord[index].FeatureTag[1], feature_list->FeatureRecord[index].FeatureTag[2], feature_list->FeatureRecord[index].FeatureTag[3]);
+ language->features[i].feature = ((const BYTE*)feature_list + GET_BE_WORD(feature_list->FeatureRecord[index].Feature));
+ feature = (const OT_Feature*)language->features[i].feature;
+ language->features[i].lookup_count = GET_BE_WORD(feature->LookupCount);
+ language->features[i].lookups = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * language->features[i].lookup_count);
+ for (j = 0; j < language->features[i].lookup_count; j++)
+ language->features[i].lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]);
+ }
+ }
+ }
+ else if (count)
+ {
+ language->features = HeapReAlloc(GetProcessHeap(),0,language->features, sizeof(LoadedFeature)*(language->feature_count + count));
+
+ for (i = 0; i < count; i++)
+ {
+ const OT_Feature *feature;
+ int j;
+ int index = GET_BE_WORD(lang->FeatureIndex[i]);
+ int idx = language->feature_count + i;
+
+ language->features[idx].tag = MS_MAKE_TAG(feature_list->FeatureRecord[index].FeatureTag[0], feature_list->FeatureRecord[index].FeatureTag[1], feature_list->FeatureRecord[index].FeatureTag[2], feature_list->FeatureRecord[index].FeatureTag[3]);
+ language->features[idx].feature = ((const BYTE*)feature_list + GET_BE_WORD(feature_list->FeatureRecord[index].Feature));
+ feature = (const OT_Feature*)language->features[idx].feature;
+ language->features[idx].lookup_count = GET_BE_WORD(feature->LookupCount);
+ language->features[idx].lookups = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * language->features[idx].lookup_count);
+ for (j = 0; j < language->features[idx].lookup_count; j++)
+ language->features[idx].lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]);
+ }
+ language->feature_count += count;
+ }
+}
+
+static void _initialize_feature_cache(ScriptCache *psc, LoadedLanguage *language)
+{
+ if (!language->feature_count)
+ {
+ GSUB_initialize_feature_cache(psc->GSUB_Table, language);
+ GPOS_expand_feature_cache(psc->GPOS_Table, language);
+ }
+}
+
+HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature)
{
int i;
HRESULT rc = S_OK;
@@ -1215,7 +1285,7 @@ HRESULT OpenType_GSUB_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_t
_initialize_language_cache(script);
- if (script->default_language.gsub_table && script->default_language.tag == language_tag)
+ if ((script->default_language.gsub_table || script->default_language.gpos_table) && script->default_language.tag == language_tag)
language = &script->default_language;
else
{
@@ -1235,7 +1305,7 @@ HRESULT OpenType_GSUB_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_t
return S_OK;
}
- GSUB_initialize_feature_cache(psc->GSUB_Table, language);
+ _initialize_feature_cache(psc, language);
*pcTags = language->feature_count;
diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c
index 1655992..f9a0909 100644
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -565,13 +565,13 @@ static LoadedFeature* load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCac
language = MS_MAKE_TAG('d','f','l','t');
attempt--;
- OpenType_GSUB_GetFontFeatureTags(psc, script, language, FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), 1, &tags, &cTags, &feature);
+ OpenType_GetFontFeatureTags(psc, script, language, FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), 1, &tags, &cTags, &feature);
} while(attempt && !feature);
/* try in the default (latin) table */
if (!feature)
- OpenType_GSUB_GetFontFeatureTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), 1, &tags, &cTags, &feature);
+ OpenType_GetFontFeatureTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), 1, &tags, &cTags, &feature);
}
TRACE("Feature %s located at %p\n",debugstr_an(feat,4),feature);
@@ -3294,7 +3294,7 @@ HRESULT SHAPE_GetFontFeatureTags( HDC hdc, ScriptCache *psc,
filter = TRUE;
}
- hr = OpenType_GSUB_GetFontFeatureTags(psc, tagScript, tagLangSys, filter, 0x00000000, cMaxTags, pFeatureTags, pcTags, NULL);
+ hr = OpenType_GetFontFeatureTags(psc, tagScript, tagLangSys, filter, 0x00000000, cMaxTags, pFeatureTags, pcTags, NULL);
if (FAILED(hr))
*pcTags = 0;
diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h
index 4077833..8cc8f14 100644
--- a/dlls/usp10/usp10_internal.h
+++ b/dlls/usp10/usp10_internal.h
@@ -238,4 +238,4 @@ void OpenType_GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGly
INT OpenType_apply_GSUB_lookup(LPCVOID table, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) DECLSPEC_HIDDEN;
HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) DECLSPEC_HIDDEN;
HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags) DECLSPEC_HIDDEN;
-HRESULT OpenType_GSUB_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) DECLSPEC_HIDDEN;
+HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) DECLSPEC_HIDDEN;
More information about the wine-cvs
mailing list