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

[Simon Hausmann]

 src/harfbuzz-gpos.c |    6 ++++++
 1 files changed, 6 insertions(+)

New commits:
diff-tree 55144a510e2b8cd70389fccfa0db79d424cf03e9 (from parents)
Merge: fdc0d568cbde695cbed00169371e6371cd540950 03e5277999d9366e2746481e01243cf32d4446e8
Author: Simon Hausmann <shausman at rhea.troll.no>
Date:   Tue Apr 3 14:00:20 2007 +0200

    Merge branch 'stable'
    
    Conflicts:
    
    	src/harfbuzz-gpos.c

diff-tree 03e5277999d9366e2746481e01243cf32d4446e8 (from 8ada6d20e1b0fb6e3dfdc8ca113ac8dd7ef2a243)
Author: Simon Hausmann <shausman at rhea.troll.no>
Date:   Tue Apr 3 13:48:15 2007 +0200

    Fixed gpos pair adjustments sometimes not being applied if the first glyph
    was covered but not the second. In that case we did not try looking up the
    second glyph in the next iteration. This mean for example that while "Te"
    was nicely kerned "QTe" wasn't because after we failed to look up "T" for
    the "QT" pair we skipped looking up "T" for "TE" in the next iteration.
    
    Reviewed by Denis Jacquerye

diff --git a/src/harfbuzz-gpos.c b/src/harfbuzz-gpos.c
index 2ed9df7..513f3fb 100644
--- a/src/harfbuzz-gpos.c
+++ b/src/harfbuzz-gpos.c
@@ -1652,6 +1652,12 @@ static FT_Error  Lookup_PairPos( GPOS_In
     return HB_Err_Invalid_GPOS_SubTable_Format;
   }
 
+  /* if we don't have coverage for the second glyph don't skip it for
+     further lookups but reset in_pos back to the first_glyph and let
+     the caller in Do_String_Lookup increment in_pos */
+  if ( error == HB_Err_Not_Covered )
+      buffer->in_pos = first_pos;
+
   /* adjusting the `next' glyph */
 
   if ( pp->ValueFormat2 )
diff-tree 8ada6d20e1b0fb6e3dfdc8ca113ac8dd7ef2a243 (from 1dab2d4f636d30447741f5fd8132d6dd1e833467)
Author: Simon Hausmann <shausman at rhea.troll.no>
Date:   Thu Feb 15 10:20:14 2007 +0100

    Fix uninitialized variable

diff --git a/src/harfbuzz-gdef.c b/src/harfbuzz-gdef.c
index 5a649de..7a30d8b 100644
--- a/src/harfbuzz-gdef.c
+++ b/src/harfbuzz-gdef.c
@@ -1217,6 +1217,8 @@ FT_Error  _HB_GDEF_Check_Property( HB_GD
 	   *property != desired_attachment_class )
 	return HB_Err_Not_Covered;
     }
+  } else {
+      *property = 0;
   }
 
   return FT_Err_Ok;
diff-tree 1dab2d4f636d30447741f5fd8132d6dd1e833467 (from 8ddadf4f615ea6c5af5dae3d1a0e48c05bf42597)
Author: Simon Hausmann <shausman at rhea.troll.no>
Date:   Wed Feb 14 16:52:30 2007 +0100

    removed old cvsignore files

diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 375bc12..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile.in
-Makefile
-*.lo
-*.la
-.deps
-.libs
-harfbuzz-dump
diff-tree 8ddadf4f615ea6c5af5dae3d1a0e48c05bf42597 (from 80243671fbc04ae054de7d6401849fa875f1e865)
Author: Simon Hausmann <shausman at rhea.troll.no>
Date:   Tue Feb 13 14:50:29 2007 +0100

    removed generated object file :)

diff --git a/src/harfbuzz-dump-main.o b/src/harfbuzz-dump-main.o
deleted file mode 100644
index d0654dc..0000000
Binary files a/src/harfbuzz-dump-main.o and /dev/null differ
diff-tree 80243671fbc04ae054de7d6401849fa875f1e865 (from f58a473eae523d368b1f913460c4f2886915518d)
Author: lars <lars>
Date:   Fri Oct 20 08:11:29 2006 +0000

    close a mem leak.

diff --git a/src/harfbuzz-gpos.c b/src/harfbuzz-gpos.c
index 3461279..2ed9df7 100644
--- a/src/harfbuzz-gpos.c
+++ b/src/harfbuzz-gpos.c
@@ -193,6 +193,8 @@ FT_Error  HB_Done_GPOS_Table( HB_GPOSHea
   _HB_OPEN_Free_FeatureList( &gpos->FeatureList, memory );
   _HB_OPEN_Free_ScriptList( &gpos->ScriptList, memory );
 
+  FREE( gpos );
+
   return FT_Err_Ok;
 }