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

[Behdad Esfahbod]

 src/hb-face.cc      |    2 +-
 src/hb-ft.cc        |   30 +++++++++++++++++++++++++++++-
 src/hb-graphite2.cc |    5 ++---
 src/hb-graphite2.h  |    2 ++
 4 files changed, 34 insertions(+), 5 deletions(-)

New commits:
commit 882edce48e507a1c76c908ec2db04aac218b67d6
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Sep 13 20:36:43 2013 -0400

    [graphite2] Fix include

diff --git a/src/hb-graphite2.cc b/src/hb-graphite2.cc
index cce8606..6fe16ca 100644
--- a/src/hb-graphite2.cc
+++ b/src/hb-graphite2.cc
@@ -30,11 +30,10 @@
 #define hb_graphite2_shaper_font_data_t gr_font
 #include "hb-shaper-impl-private.hh"
 
-#include <graphite2/Font.h>
-#include <graphite2/Segment.h>
-
 #include "hb-graphite2.h"
 
+#include <graphite2/Segment.h>
+
 #include "hb-ot-tag.h"
 
 
diff --git a/src/hb-graphite2.h b/src/hb-graphite2.h
index bea68f9..3eae54a 100644
--- a/src/hb-graphite2.h
+++ b/src/hb-graphite2.h
@@ -28,6 +28,8 @@
 
 #include "hb.h"
 
+#include <graphite2/Font.h>
+
 HB_BEGIN_DECLS
 
 
commit ace5c7eb4c2302a6a7eb3576e6dbc3bc026e569c
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Sep 13 20:34:42 2013 -0400

    [introspection] hb-ft annotations

diff --git a/src/hb-face.cc b/src/hb-face.cc
index b21d6e7..ebe8ec5 100644
--- a/src/hb-face.cc
+++ b/src/hb-face.cc
@@ -70,7 +70,7 @@ const hb_face_t _hb_face_nil = {
 
 /**
  * hb_face_create_for_tables:
- * @reference_table_func:  (closure user_data) (destroy destroy) (scope notified):
+ * @reference_table_func: (closure user_data) (destroy destroy) (scope notified):
  * @user_data: 
  * @destroy: 
  *
diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index a4f4bbd..ff1e187 100644
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -319,7 +319,16 @@ reference_table  (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data)
 			 buffer, free);
 }
 
-
+/**
+ * hb_ft_face_create:
+ * @ft_face: (destroy destroy) (scope notified): 
+ * @destroy:
+ *
+ * 
+ *
+ * Return value: (transfer full): 
+ * Since: 1.0
+ **/
 hb_face_t *
 hb_ft_face_create (FT_Face           ft_face,
 		   hb_destroy_func_t destroy)
@@ -355,6 +364,15 @@ hb_ft_face_finalize (FT_Face ft_face)
   hb_face_destroy ((hb_face_t *) ft_face->generic.data);
 }
 
+/**
+ * hb_ft_face_create_cached:
+ * @ft_face: 
+ *
+ * 
+ *
+ * Return value: (transfer full): 
+ * Since: 1.0
+ **/
 hb_face_t *
 hb_ft_face_create_cached (FT_Face ft_face)
 {
@@ -376,6 +394,16 @@ _do_nothing (void)
 }
 
 
+/**
+ * hb_ft_font_create:
+ * @ft_face: (destroy destroy) (scope notified): 
+ * @destroy:
+ *
+ * 
+ *
+ * Return value: (transfer full): 
+ * Since: 1.0
+ **/
 hb_font_t *
 hb_ft_font_create (FT_Face           ft_face,
 		   hb_destroy_func_t destroy)