walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Limit GetJustifiedGlyphs only to scripts with custom justification character

This commit is contained in:
Ebrahim Byagowi 2016-04-01 15:36:40 +00:00
parent 32ae9d1b3f
commit adf20ba0d1
1 changed files with 60 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/hb-directwrite.cc
View File

@ -815,7 +815,7 @@ retry_getglyphs:
} }
// TODO: get lineWith from somewhere // TODO: get lineWith from somewhere
FLOAT lineWidth = 15000; FLOAT lineWidth = 60000;
FLOAT* justifiedGlyphAdvances = FLOAT* justifiedGlyphAdvances =
(FLOAT*) malloc (maxGlyphCount * sizeof (FLOAT)); (FLOAT*) malloc (maxGlyphCount * sizeof (FLOAT));
@ -830,51 +830,73 @@ retry_getglyphs:
return false; return false;
} }
retry_getjustifiedglyphs: DWRITE_SCRIPT_PROPERTIES scriptProperties;
UINT16* modifiedClusterMap = (UINT16*) malloc (maxGlyphCount * sizeof (UINT16)); hr = analyzer->GetScriptProperties (runHead->mScript, &scriptProperties);
UINT16* modifiedGlyphIndices = (UINT16*) malloc (maxGlyphCount * sizeof (UINT16));
FLOAT* modifiedGlyphAdvances = (FLOAT*) malloc (maxGlyphCount * sizeof (FLOAT));
DWRITE_GLYPH_OFFSET* modifiedGlyphOffsets = (DWRITE_GLYPH_OFFSET*)
malloc (maxGlyphCount * sizeof (DWRITE_GLYPH_OFFSET));
UINT32 actualGlyphsCount;
hr = analyzer->GetJustifiedGlyphs (fontFace, fontEmSize, runHead->mScript,
textLength, glyphCount, maxGlyphCount, clusterMap, glyphIndices,
glyphAdvances, justifiedGlyphAdvances, justifiedGlyphOffsets,
glyphProperties, &actualGlyphsCount, modifiedClusterMap, modifiedGlyphIndices,
modifiedGlyphAdvances, modifiedGlyphOffsets);
if (hr == HRESULT_FROM_WIN32 (ERROR_INSUFFICIENT_BUFFER))
{
maxGlyphCount = actualGlyphsCount;
free (modifiedClusterMap);
free (modifiedGlyphIndices);
free (modifiedGlyphAdvances);
free (modifiedGlyphOffsets);
maxGlyphCount = actualGlyphsCount;
goto retry_getjustifiedglyphs;
}
if (FAILED (hr)) if (FAILED (hr))
{ {
FAIL ("Analyzer failed to get justified glyphs."); FAIL ("Analyzer failed to get script properties.");
return false; return false;
} }
uint32_t justificationCharacter = scriptProperties.justificationCharacter;
free (clusterMap); // if a script justificationCharacter is not space, it can have GetJustifiedGlyphs
free (glyphIndices); if (justificationCharacter != 32)
free (glyphAdvances); {
free (glyphOffsets); retry_getjustifiedglyphs:
UINT16* modifiedClusterMap = (UINT16*) malloc (maxGlyphCount * sizeof (UINT16));
UINT16* modifiedGlyphIndices = (UINT16*) malloc (maxGlyphCount * sizeof (UINT16));
FLOAT* modifiedGlyphAdvances = (FLOAT*) malloc (maxGlyphCount * sizeof (FLOAT));
DWRITE_GLYPH_OFFSET* modifiedGlyphOffsets = (DWRITE_GLYPH_OFFSET*)
malloc (maxGlyphCount * sizeof (DWRITE_GLYPH_OFFSET));
UINT32 actualGlyphsCount;
hr = analyzer->GetJustifiedGlyphs (fontFace, fontEmSize, runHead->mScript,
textLength, glyphCount, maxGlyphCount, clusterMap, glyphIndices,
glyphAdvances, justifiedGlyphAdvances, justifiedGlyphOffsets,
glyphProperties, &actualGlyphsCount, modifiedClusterMap, modifiedGlyphIndices,
modifiedGlyphAdvances, modifiedGlyphOffsets);
glyphCount = actualGlyphsCount; if (hr == HRESULT_FROM_WIN32 (ERROR_INSUFFICIENT_BUFFER))
clusterMap = modifiedClusterMap; {
glyphIndices = modifiedGlyphIndices; maxGlyphCount = actualGlyphsCount;
glyphAdvances = modifiedGlyphAdvances; free (modifiedClusterMap);
glyphOffsets = modifiedGlyphOffsets; free (modifiedGlyphIndices);
free (modifiedGlyphAdvances);
free (modifiedGlyphOffsets);
maxGlyphCount = actualGlyphsCount;
goto retry_getjustifiedglyphs;
}
if (FAILED (hr))
{
FAIL ("Analyzer failed to get justified glyphs.");
return false;
}
free (clusterMap);
free (glyphIndices);
free (glyphAdvances);
free (glyphOffsets);
glyphCount = actualGlyphsCount;
clusterMap = modifiedClusterMap;
glyphIndices = modifiedGlyphIndices;
glyphAdvances = modifiedGlyphAdvances;
glyphOffsets = modifiedGlyphOffsets;
free(justifiedGlyphAdvances);
free(justifiedGlyphOffsets);
}
else
{
free(glyphAdvances);
free(glyphOffsets);
glyphAdvances = justifiedGlyphAdvances;
glyphOffsets = justifiedGlyphOffsets;
}
free(justificationOpportunities); free(justificationOpportunities);
free(justifiedGlyphAdvances);
free(justifiedGlyphOffsets);
#endif #endif