[HarfBuzz] harfbuzz: Branch 'master'

[Lars Knoll]

 src/harfbuzz-hebrew.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 2b78f0d78ad3075fd1657d1260b31219e1a51557
Author: Lars Knoll <lars.knoll at nokia.com>
Date:   Mon Dec 21 08:54:33 2009 +0100

    revert change b90ffbace5536786eafe23e28ec3eee74c7c4e27
    
    The patch causes crashes using hebrew, and I can't see what
    the change is supposed to fix.
    
    See also http://bugreports.qt.nokia.com/browse/QTBUG-6436

diff --git a/src/harfbuzz-hebrew.c b/src/harfbuzz-hebrew.c
index 2bda386..67029be 100644
--- a/src/harfbuzz-hebrew.c
+++ b/src/harfbuzz-hebrew.c
@@ -56,8 +56,6 @@ HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item)
 
     assert(shaper_item->item.script == HB_Script_Hebrew);
 
-    HB_HeuristicSetGlyphAttributes(shaper_item);
-
 #ifndef NO_OPENTYPE
     if (HB_SelectScript(shaper_item, hebrew_features)) {
 
@@ -65,7 +63,7 @@ HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item)
         if (!HB_ConvertStringToGlyphIndices(shaper_item))
             return FALSE;
 
-
+        HB_HeuristicSetGlyphAttributes(shaper_item);
         HB_OpenTypeShape(shaper_item, /*properties*/0);
         return HB_OpenTypePosition(shaper_item, availableGlyphs, /*doLogClusters*/TRUE);
     }