[PATCH 5/5] usp10: Simplify GPOS_expand_script_cache().
Henri Verbeet
hverbeet at codeweavers.com
Thu Mar 15 03:08:42 CDT 2018
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/usp10/opentype.c | 80 ++++++++++++++++++++++++---------------------------
1 file changed, 37 insertions(+), 43 deletions(-)
diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c
index 74620a38f13..521b816d07d 100644
--- a/dlls/usp10/opentype.c
+++ b/dlls/usp10/opentype.c
@@ -2565,6 +2565,23 @@ unsigned int OpenType_apply_GPOS_lookup(const ScriptCache *script_cache, const O
lookup_index, glyphs, glyph_index, glyph_count, goffset);
}
+static LoadedScript *usp10_script_cache_add_script(ScriptCache *script_cache, OPENTYPE_TAG tag)
+{
+ LoadedScript *script;
+
+ if (!usp10_array_reserve((void **)&script_cache->scripts, &script_cache->scripts_size,
+ script_cache->script_count + 1, sizeof(*script_cache->scripts)))
+ {
+ ERR("Failed to grow scripts array.\n");
+ return NULL;
+ }
+
+ script = &script_cache->scripts[script_cache->script_count++];
+ script->tag = tag;
+
+ return script;
+}
+
static LoadedScript *usp10_script_cache_get_script(ScriptCache *script_cache, OPENTYPE_TAG tag)
{
size_t i;
@@ -2610,57 +2627,34 @@ static void GSUB_initialize_script_cache(ScriptCache *psc)
static void GPOS_expand_script_cache(ScriptCache *psc)
{
- int i, count;
- const OT_ScriptList *script;
- const GPOS_Header* header = (const GPOS_Header*)psc->GPOS_Table;
- LoadedScript *loaded_script;
+ SIZE_T initial_count, count, i;
+ const OT_ScriptList *list;
+ const GPOS_Header *header;
+ LoadedScript *script;
+ OPENTYPE_TAG tag;
- if (!header)
+ if (!(header = psc->GPOS_Table))
return;
- script = (const OT_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList));
- count = GET_BE_WORD(script->ScriptCount);
-
- if (!count)
+ list = (const OT_ScriptList *)((const BYTE *)header + GET_BE_WORD(header->ScriptList));
+ if (!(count = GET_BE_WORD(list->ScriptCount)))
return;
- if (!psc->script_count)
- {
- psc->script_count = count;
- TRACE("initializing %li scripts in this font\n",psc->script_count);
- if (psc->script_count)
- {
- psc->scripts = heap_alloc_zero(psc->script_count * sizeof(*psc->scripts));
- for (i = 0; i < psc->script_count; i++)
- {
- int offset = GET_BE_WORD(script->ScriptRecord[i].Script);
- psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]);
- psc->scripts[i].gpos_table = ((const BYTE*)script + offset);
- }
- }
- }
- else
+ TRACE("Initialising %lu scripts in this font.\n", count);
+
+ initial_count = psc->script_count;
+ for (i = 0; i < count; ++i)
{
- for (i = 0; i < count; i++)
- {
- int offset = GET_BE_WORD(script->ScriptRecord[i].Script);
- OPENTYPE_TAG tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]);
+ tag = MS_MAKE_TAG(list->ScriptRecord[i].ScriptTag[0],
+ list->ScriptRecord[i].ScriptTag[1],
+ list->ScriptRecord[i].ScriptTag[2],
+ list->ScriptRecord[i].ScriptTag[3]);
- if (!(loaded_script = usp10_script_cache_get_script(psc, tag)))
- {
- if (!usp10_array_reserve((void **)&psc->scripts, &psc->scripts_size,
- psc->script_count + 1, sizeof(*psc->scripts)))
- {
- ERR("Failed grow scripts array.\n");
- return;
- }
+ if (!(initial_count && (script = usp10_script_cache_get_script(psc, tag)))
+ && !(script = usp10_script_cache_add_script(psc, tag)))
+ return;
- loaded_script = &psc->scripts[psc->script_count];
- ++psc->script_count;
- loaded_script->tag = tag;
- }
- loaded_script->gpos_table = (const BYTE *)script + offset;
- }
+ script->gpos_table = (const BYTE *)list + GET_BE_WORD(list->ScriptRecord[i].Script);
}
}
--
2.11.0
More information about the wine-devel
mailing list