system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-19 12:40:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

usp10: Make the script cache parameter to get_opentype_script() const.

Browse source 
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 2017-03-19 22:59:46 +01:00 committed by Alexandre Julliard
parent c8f87ad3ed
commit df21247491
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dlls/usp10/shape.c
View file

@ -565,19 +565,21 @@ static INT GSUB_apply_feature_all_lookups(LPCVOID header, LoadedFeature *feature
return out_index;
}
static OPENTYPE_TAG get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, BOOL tryNew)
static OPENTYPE_TAG get_opentype_script(HDC hdc, const SCRIPT_ANALYSIS *psa,
const ScriptCache *script_cache, BOOL try_new)
{
UINT charset;
if (psc->userScript != 0)
if (script_cache->userScript)
{
if (tryNew && ShapingData[psa->eScript].newOtTag != 0 && psc->userScript == scriptInformation[psa->eScript].scriptTag)
if (try_new && ShapingData[psa->eScript].newOtTag
&& script_cache->userScript == scriptInformation[psa->eScript].scriptTag)
return ShapingData[psa->eScript].newOtTag;
else
return psc->userScript;
return script_cache->userScript;
}
if (tryNew && ShapingData[psa->eScript].newOtTag != 0)
if (try_new && ShapingData[psa->eScript].newOtTag)
return ShapingData[psa->eScript].newOtTag;
if (scriptInformation[psa->eScript].scriptTag)