[HarfBuzz] harfbuzz: Branch 'master'

[Simon Hausmann]

 src/harfbuzz-shaper.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree 23c738a0b247e382f086b4388d5f9d4b7159b986 (from d34bcf298bb999e84d75df9d8ad35366a44ceb80)
Author: Simon Hausmann <simon at scruffy.troll.no>
Date:   Wed Aug 1 12:59:25 2007 +0200

    Use unsigned int instead of uint to compile on OS X.

diff --git a/src/harfbuzz-shaper.cpp b/src/harfbuzz-shaper.cpp
index d289a77..a08d570 100644
--- a/src/harfbuzz-shaper.cpp
+++ b/src/harfbuzz-shaper.cpp
@@ -726,7 +726,7 @@ static HB_Bool checkScript(HB_Face face,
     if (!face->gsub && !face->gpos)
         return false;
 
-    uint tag = ot_scripts[script].tag;
+    unsigned int tag = ot_scripts[script].tag;
     int requirements = ot_scripts[script].flags;
 
     if (requirements & RequiresGsub) {
@@ -831,7 +831,7 @@ HB_Face HB_NewFace(void *font, HB_GetFon
 
     HB_close_stream(gdefStream);
 
-    for (uint i = 0; i < HB_ScriptCount; ++i)
+    for (unsigned int i = 0; i < HB_ScriptCount; ++i)
         face->supported_scripts[i] = checkScript(face, i);
 
     hb_buffer_new(&face->buffer);
@@ -874,7 +874,7 @@ HB_Bool HB_SelectScript(HB_ShaperItem *s
 
     assert(script < HB_ScriptCount);
     // find script in our list of supported scripts.
-    uint tag = ot_scripts[script].tag;
+    unsigned int tag = ot_scripts[script].tag;
 
     if (face->gsub && features) {
 #ifdef OT_DEBUG
@@ -982,7 +982,7 @@ HB_Bool HB_OpenTypeShape(HB_ShaperItem *
 
     face->glyphs_substituted = false;
     if (face->gsub) {
-        uint error = HB_GSUB_Apply_String(face->gsub, face->buffer);
+        unsigned int error = HB_GSUB_Apply_String(face->gsub, face->buffer);
         if (error && error != HB_Err_Not_Covered)
             return false;
         face->glyphs_substituted = (error != HB_Err_Not_Covered);