usp10: Correct ScriptStringGetLogicalWidths to be based on char not glyph.

63490ce0 · Aric Stewart · Alexandre Julliard · 750404ee · 63490ce0
Commit 63490ce0 authored Oct 06, 2011 by Aric Stewart Committed by Alexandre Julliard Oct 06, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

usp10.c dlls/usp10/usp10.c +5 -2

No files found.
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -2287,9 +2287,12 @@ HRESULT WINAPI ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS ssa, int *piD

    for (i = 0; i < analysis->numItems; i++)
    {
-        for (j = 0; j < analysis->glyphs[i].numGlyphs; j++)
+        int cChar = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos;
+        for (j = 0; j < cChar; j++)
        {
-            piDx[next] = analysis->glyphs[i].piAdvance[j];
+
+            int glyph = analysis->glyphs[i].pwLogClust[j];
+            piDx[next] = analysis->glyphs[i].piAdvance[glyph];
            next++;
        }
    }