usp10: When calling ShapeIndicSyllables we need to use cChars which is the actual number of original characters.
This commit is contained in:
parent
87ebfe5d18
commit
8b14f3f542
|
@ -2417,7 +2417,7 @@ static void ContextualShape_Sinhala(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *
|
|||
/* Step 4: Base Form application to syllables */
|
||||
GetGlyphIndicesW(hdc, input, cCount, pwOutGlyphs, 0);
|
||||
*pcGlyphs = cCount;
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, sinhala_lex, NULL, TRUE);
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, sinhala_lex, NULL, TRUE);
|
||||
|
||||
HeapFree(GetProcessHeap(),0,input);
|
||||
HeapFree(GetProcessHeap(),0,syllables);
|
||||
|
@ -2474,7 +2474,7 @@ static void ContextualShape_Devanagari(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI
|
|||
*pcGlyphs = cCount;
|
||||
|
||||
/* Step 3: Base Form application to syllables */
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, devanagari_lex, NULL, modern);
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, devanagari_lex, NULL, modern);
|
||||
|
||||
HeapFree(GetProcessHeap(),0,input);
|
||||
HeapFree(GetProcessHeap(),0,syllables);
|
||||
|
@ -2544,7 +2544,7 @@ static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *
|
|||
}
|
||||
|
||||
/* Step 4: Base Form application to syllables */
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, bengali_lex, NULL, modern);
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, bengali_lex, NULL, modern);
|
||||
|
||||
HeapFree(GetProcessHeap(),0,input);
|
||||
HeapFree(GetProcessHeap(),0,syllables);
|
||||
|
@ -2592,7 +2592,7 @@ static void ContextualShape_Gurmukhi(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS
|
|||
*pcGlyphs = cCount;
|
||||
|
||||
/* Step 3: Base Form application to syllables */
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gurmukhi_lex, NULL, modern);
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gurmukhi_lex, NULL, modern);
|
||||
|
||||
HeapFree(GetProcessHeap(),0,input);
|
||||
HeapFree(GetProcessHeap(),0,syllables);
|
||||
|
@ -2632,7 +2632,7 @@ static void ContextualShape_Gujarati(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS
|
|||
*pcGlyphs = cCount;
|
||||
|
||||
/* Step 2: Base Form application to syllables */
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gujarati_lex, NULL, modern);
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, gujarati_lex, NULL, modern);
|
||||
|
||||
HeapFree(GetProcessHeap(),0,input);
|
||||
HeapFree(GetProcessHeap(),0,syllables);
|
||||
|
@ -2688,7 +2688,7 @@ static void ContextualShape_Oriya(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps
|
|||
*pcGlyphs = cCount;
|
||||
|
||||
/* Step 3: Base Form application to syllables */
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, oriya_lex, NULL, modern);
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, oriya_lex, NULL, modern);
|
||||
|
||||
HeapFree(GetProcessHeap(),0,input);
|
||||
HeapFree(GetProcessHeap(),0,syllables);
|
||||
|
@ -2738,7 +2738,7 @@ static void ContextualShape_Tamil(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps
|
|||
*pcGlyphs = cCount;
|
||||
|
||||
/* Step 3: Base Form application to syllables */
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, tamil_lex, SecondReorder_Like_Tamil, modern);
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, tamil_lex, SecondReorder_Like_Tamil, modern);
|
||||
|
||||
HeapFree(GetProcessHeap(),0,input);
|
||||
HeapFree(GetProcessHeap(),0,syllables);
|
||||
|
@ -2787,7 +2787,7 @@ static void ContextualShape_Telugu(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p
|
|||
*pcGlyphs = cCount;
|
||||
|
||||
/* Step 3: Base Form application to syllables */
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, telugu_lex, SecondReorder_Like_Telugu, modern);
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, telugu_lex, SecondReorder_Like_Telugu, modern);
|
||||
|
||||
HeapFree(GetProcessHeap(),0,input);
|
||||
HeapFree(GetProcessHeap(),0,syllables);
|
||||
|
@ -2839,7 +2839,7 @@ static void ContextualShape_Kannada(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *
|
|||
*pcGlyphs = cCount;
|
||||
|
||||
/* Step 3: Base Form application to syllables */
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, kannada_lex, SecondReorder_Like_Telugu, modern);
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, kannada_lex, SecondReorder_Like_Telugu, modern);
|
||||
|
||||
HeapFree(GetProcessHeap(),0,input);
|
||||
HeapFree(GetProcessHeap(),0,syllables);
|
||||
|
@ -2884,7 +2884,7 @@ static void ContextualShape_Malayalam(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS
|
|||
*pcGlyphs = cCount;
|
||||
|
||||
/* Step 3: Base Form application to syllables */
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cCount, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, malayalam_lex, SecondReorder_Like_Tamil, modern);
|
||||
ShapeIndicSyllables(hdc, psc, psa, input, cChars, syllables, syllable_count, pwOutGlyphs, pcGlyphs, pwLogClust, malayalam_lex, SecondReorder_Like_Tamil, modern);
|
||||
|
||||
HeapFree(GetProcessHeap(),0,input);
|
||||
HeapFree(GetProcessHeap(),0,syllables);
|
||||
|
|
Loading…
Reference in New Issue