[HarfBuzz] harfbuzz: Branch 'pango' - 3 commits

[Simon Hausmann]

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

New commits:
diff-tree f82e930f2dc40102cc6e4ee6523edf5770fdabc5 (from parents)
Merge: 10e195914fc3fef80dcfb49e58995df23aaa5900 666be3e9f30bb8ad14acc0fb426df98d5b092bd9
Author: Simon Hausmann <shausman at trolltech.com>
Date:   Sun Sep 2 08:33:32 2007 +0200

    Merge branch 'master' into pango

diff-tree 666be3e9f30bb8ad14acc0fb426df98d5b092bd9 (from parents)
Merge: 2c4b930605c1660dd3843117b0d729fcf386bcab 62f22c9c2a386e02477eaf2ffa9fb26fd70ec410
Author: Simon Hausmann <shausman at trolltech.com>
Date:   Sun Sep 2 08:33:18 2007 +0200

    Merge branch 'stable'

diff --cc src/harfbuzz-buffer.c
index 6d53baf,40a7d2b..3eb7965
@@@ -212,11 -217,11 +212,11 @@@
    buffer->out_string[buffer->out_pos++] = buffer->in_string[buffer->in_pos++];
    buffer->out_length = buffer->out_pos;
  
 -  return FT_Err_Ok;
 +  return HB_Err_Ok;
  }
  
 -FT_UShort
 +HB_UShort
  hb_buffer_allocate_ligid( HB_Buffer buffer )
  {
-   return buffer->max_ligID++;
+   return ++buffer->max_ligID;
  }
diff-tree 62f22c9c2a386e02477eaf2ffa9fb26fd70ec410 (from 8dd0a6c211b32705af991a93fe15803d5bd5d921)
Author: Behdad Esfahbod   <behdad at gnome.org>
Date:   Sun Sep 2 08:33:04 2007 +0200

    Fix placement of a diacritic marks for an arabic ligature is not correct
    
    This one fixing issue that first ligature in a line was having wrong
    mark attachments. Â I was debugging a bigger problem with mark
    attachments, that's ongoing.
    
    http://bugzilla.gnome.org/show_bug.cgi?id=302952 (fixed)
    
    http://bugzilla.gnome.org/show_bug.cgi?id=437633 (not fixed yet)
    
    2007-08-29  Behdad Esfahbod  <behdad at gnome.org>
    
            Bug 302952 – The placement of a diacritic marks for an arabic ligature
    Â  Â  Â  Â  is not correct
    
    Â  Â  Â  Â  * pango/opentype/harfbuzz-buffer.c (hb_buffer_allocate_ligid): Don't
    Â  Â  Â  Â  use zero as allocated ligature id. Â Zero means no ligature id.

diff --git a/src/harfbuzz-buffer.c b/src/harfbuzz-buffer.c
index 3d233b4..40a7d2b 100644
--- a/src/harfbuzz-buffer.c
+++ b/src/harfbuzz-buffer.c
@@ -223,5 +223,5 @@ hb_buffer_copy_output_glyph ( HB_Buffer 
 FT_UShort
 hb_buffer_allocate_ligid( HB_Buffer buffer )
 {
-  return buffer->max_ligID++;
+  return ++buffer->max_ligID;
 }