[HarfBuzz] harfbuzz-ng: Branch 'master' - 2 commits

[Behdad Esfahbod]

 contrib/python/lib/harfbuzz.pyx        |    7 ++++--
 src/hb-ot-shape-complex-arabic-table.h |   37 +++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

New commits:
commit 3c48982be6b2286088541ee55cac78b0f2b6e771
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Nov 28 19:39:47 2010 -0500

    Adjust pyx files to reflect change from int to hb_var_int_t
    
    Patch from Thomas Hunger.

diff --git a/contrib/python/lib/harfbuzz.pyx b/contrib/python/lib/harfbuzz.pyx
index 4d71ead..f483fd6 100644
--- a/contrib/python/lib/harfbuzz.pyx
+++ b/contrib/python/lib/harfbuzz.pyx
@@ -52,12 +52,15 @@ cdef extern from "hb-buffer.h" :
         hb_mask_t mask
         unsigned long cluster
 
+    ctypedef union hb_var_int_t:
+        unsigned long u32
+
     ctypedef struct hb_glyph_position_t :
         hb_position_t x_advance
         hb_position_t y_advance
         hb_position_t x_offset
         hb_position_t y_offset
-        unsigned long internal
+        hb_var_int_t  var
 
     hb_buffer_t *hb_buffer_create(unsigned int size)
     hb_buffer_t *hb_buffer_reference(hb_buffer_t *buffer)
@@ -156,7 +159,7 @@ cdef class buffer :
         infos = hb_buffer_get_glyph_infos(self.buffer)
         positions = hb_buffer_get_glyph_positions(self.buffer)
         for 0 <= i < num :
-            temp = glyphinfo(infos[i].codepoint, infos[i].cluster, (positions[i].x_advance / scale, positions[i].y_advance / scale), (positions[i].x_offset / scale, positions[i].y_offset / scale), positions[i].internal)
+            temp = glyphinfo(infos[i].codepoint, infos[i].cluster, (positions[i].x_advance / scale, positions[i].y_advance / scale), (positions[i].x_offset / scale, positions[i].y_offset / scale), positions[i].var.u32)
             res.append(temp)
         return res
 
commit 4f9e4a40bc248aeb1364ed6f4aa7f392aa364497
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Nov 22 11:30:32 2010 -0500

    Fix failing checks

diff --git a/src/hb-ot-shape-complex-arabic-table.h b/src/hb-ot-shape-complex-arabic-table.h
index f5cd0fe..861c6d0 100644
--- a/src/hb-ot-shape-complex-arabic-table.h
+++ b/src/hb-ot-shape-complex-arabic-table.h
@@ -1,3 +1,36 @@
+/*
+ * Copyright (C) 2010  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_H
+#define HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_H
+
+#include "hb-private.h"
+
+HB_BEGIN_DECLS
+
 /* == Start of generated table == */
 /*
  * The following table is generated by running:
@@ -617,3 +650,7 @@ static const uint8_t joining_table[JOINING_TABLE_LAST-JOINING_TABLE_FIRST+2] =
   JOINING_TYPE_X  /* dummy */
 };
 /* == End of generated table == */
+
+HB_END_DECLS
+
+#endif /* HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_H */