[HarfBuzz] harfbuzz: Branch 'master' - 4 commits

[Simon Hausmann]

 src/harfbuzz-gsub.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 5ae52c37acc729d7927d003170de8dcfb8d951cf (from parents)
Merge: 596d178b6241ce0fd7c7b59ccc340e0ffb4162d2 23c738a0b247e382f086b4388d5f9d4b7159b986
Author: Simon Hausmann <shausman at trolltech.com>
Date:   Tue Aug 21 09:04:12 2007 +0200

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/harfbuzz

diff-tree 596d178b6241ce0fd7c7b59ccc340e0ffb4162d2 (from parents)
Merge: d34bcf298bb999e84d75df9d8ad35366a44ceb80 f2acc48e352c09c6c8f714c1e24ca5bc490da113
Author: Simon Hausmann <shausman at trolltech.com>
Date:   Tue Aug 21 09:01:11 2007 +0200

    Merge branch 'stable'

diff-tree f2acc48e352c09c6c8f714c1e24ca5bc490da113 (from e0985c2deaf9af22a91e4b809459ab842ad7d85a)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Aug 21 08:58:07 2007 +0200

    While trying to see if the patch in this bug:
    
    Â  http://bugzilla.gnome.org/show_bug.cgi?id=463430
    
    is correct (it's not), I found a small bug in harfbuzz-gsub.

diff --git a/src/harfbuzz-gsub.c b/src/harfbuzz-gsub.c
index 1d91a11..00db6e8 100644
--- a/src/harfbuzz-gsub.c
+++ b/src/harfbuzz-gsub.c
@@ -4396,7 +4396,7 @@ static FT_Error  GSUB_Do_String_Lookup( 
       error = HB_Err_Not_Covered;
 
     if ( error == HB_Err_Not_Covered )
-      if ( hb_buffer_copy_output_glyph ( buffer ) )
+      if ( (error = hb_buffer_copy_output_glyph ( buffer ) ) )
 	return error;
   }
 
diff-tree e0985c2deaf9af22a91e4b809459ab842ad7d85a (from 03e5277999d9366e2746481e01243cf32d4446e8)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Apr 3 18:44:42 2007 -0400

    [harfbuzz-open] Fix GDEF type-2 class lookup array overflow
    
    Reviewed by Simon Hausmann

diff --git a/src/harfbuzz-open.c b/src/harfbuzz-open.c
index e836df1..fa54040 100644
--- a/src/harfbuzz-open.c
+++ b/src/harfbuzz-open.c
@@ -1191,7 +1191,7 @@ static FT_Error  Get_Class1( HB_ClassDef
     *index = 0;
 
   if ( glyphID >= cdf1->StartGlyph &&
-       glyphID <= cdf1->StartGlyph + cdf1->GlyphCount )
+       glyphID < cdf1->StartGlyph + cdf1->GlyphCount )
   {
     *class = cva[glyphID - cdf1->StartGlyph];
     return FT_Err_Ok;