Aric Stewart : usp10: Use GDEF in baseIndic GlyphProp processing.

Alexandre Julliard julliard at winehq.org
Tue Dec 6 15:46:19 CST 2011


Module: wine
Branch: master
Commit: 894f2dc9bacc87cd85fac9d5e69ee5c922eda9d6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=894f2dc9bacc87cd85fac9d5e69ee5c922eda9d6

Author: Aric Stewart <aric at codeweavers.com>
Date:   Tue Dec  6 09:27:01 2011 -0600

usp10: Use GDEF in baseIndic GlyphProp processing.

---

 dlls/usp10/shape.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c
index 5fcb056..8706fad 100644
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -3263,6 +3263,7 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL
     int syllable_count = 0;
     BOOL modern = get_GSUB_Indic2(psa, psc);
 
+    GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp);
     for (i = 0; i < cGlyphs; i++)
     {
         int char_index[20];
@@ -3277,11 +3278,12 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL
             }
         }
 
+        /* Indic scripts do not set fDiacritic or fZeroWidth */
+        pGlyphProp[i].sva.fDiacritic = FALSE;
+        pGlyphProp[i].sva.fZeroWidth = FALSE;
+
         if (char_count == 0)
-        {
-            FIXME("No chars in this glyph?  Must be an error\n");
             continue;
-        }
 
         if (char_count ==1 && pwcChars[char_index[0]] == 0x0020)  /* space */
         {




More information about the wine-cvs mailing list