ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usp10: Use usp10_array_reserve() in GSUB_initialize_script_cache(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Aric Stewart <aric@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2018-03-14 11:39:16 +03:30 committed by Alexandre Julliard
parent 3abe88f125
commit 01abc2f8d2
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/usp10/opentype.c
View File

@ -2579,26 +2579,32 @@ static LoadedScript *usp10_script_cache_get_script(ScriptCache *script_cache, OP
} }
static void GSUB_initialize_script_cache(ScriptCache *psc) static void GSUB_initialize_script_cache(ScriptCache *psc)
{
int i;
if (psc->GSUB_Table)
{ {
const OT_ScriptList *script; const OT_ScriptList *script;
const GSUB_Header* header = (const GSUB_Header*)psc->GSUB_Table; const GSUB_Header *header;
SIZE_T i;
if (!(header = psc->GSUB_Table))
return;
script = (const OT_ScriptList *)((const BYTE *)header + GET_BE_WORD(header->ScriptList)); script = (const OT_ScriptList *)((const BYTE *)header + GET_BE_WORD(header->ScriptList));
psc->script_count = GET_BE_WORD(script->ScriptCount); psc->script_count = GET_BE_WORD(script->ScriptCount);
TRACE("initializing %li scripts in this font\n",psc->script_count);
if (psc->script_count) TRACE("Initialising %li scripts in this font.\n", psc->script_count);
if (!psc->script_count)
return;
if (!usp10_array_reserve((void **)&psc->scripts, &psc->scripts_size, psc->script_count, sizeof(*psc->scripts)))
ERR("Failed to allocate script array.\n");
for (i = 0; i < psc->script_count; ++i)
{ {
psc->scripts = heap_alloc_zero(psc->script_count * sizeof(*psc->scripts)); psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0],
for (i = 0; i < psc->script_count; i++) script->ScriptRecord[i].ScriptTag[1],
{ script->ScriptRecord[i].ScriptTag[2],
int offset = GET_BE_WORD(script->ScriptRecord[i].Script); script->ScriptRecord[i].ScriptTag[3]);
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].gsub_table = (const BYTE *)script + GET_BE_WORD(script->ScriptRecord[i].Script);
psc->scripts[i].gsub_table = ((const BYTE*)script + offset);
}
}
} }
} }