[API] Pass face to get_table()

diff --git a/src/hb-font.cc b/src/hb-font.cc
index a0485a5..7cdf5f6 100644 (file)
--- a/src/hb-font.cc
+++ b/src/hb-font.cc
@@ -379,7 +379,7 @@ _hb_face_for_data_closure_destroy (hb_face_for_data_closure_t *closure)
 }
 
 static hb_blob_t *
-_hb_face_for_data_get_table (hb_tag_t tag, void *user_data)
+_hb_face_for_data_get_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data)
 {
   hb_face_for_data_closure_t *data = (hb_face_for_data_closure_t *) user_data;
 
@@ -462,7 +462,7 @@ hb_face_reference_table (hb_face_t *face,
   if (unlikely (!face || !face->get_table))
     return hb_blob_get_empty ();
 
-  blob = face->get_table (tag, face->user_data);
+  blob = face->get_table (face, tag, face->user_data);
   if (unlikely (!blob))
     return hb_blob_get_empty ();
 

diff --git a/src/hb-font.h b/src/hb-font.h
index bb53f8f..97831ff 100644 (file)
--- a/src/hb-font.h
+++ b/src/hb-font.h
@@ -44,7 +44,7 @@ hb_face_t *
 hb_face_create (hb_blob_t    *blob,
                unsigned int  index);
 
-typedef hb_blob_t * (*hb_get_table_func_t)  (hb_tag_t tag, void *user_data);
+typedef hb_blob_t * (*hb_get_table_func_t)  (hb_face_t *face, hb_tag_t tag, void *user_data);
 
 /* calls destroy() when not needing user_data anymore */
 hb_face_t *

diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index a0c7521..9535ba1 100644 (file)
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -170,7 +170,7 @@ hb_ft_get_font_funcs (void)
 
 
 static hb_blob_t *
-get_table  (hb_tag_t tag, void *user_data)
+get_table  (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data)
 {
   FT_Face ft_face = (FT_Face) user_data;
   FT_Byte *buffer;

diff --git a/test/test-font.c b/test/test-font.c
index 6063736..c4f6cea 100644 (file)
--- a/test/test-font.c
+++ b/test/test-font.c
@@ -50,7 +50,7 @@ free_up (void *user_data)
 }
 
 static hb_blob_t *
-get_table (hb_tag_t tag, void *user_data)
+get_table (hb_face_t *face, hb_tag_t tag, void *user_data)
 {
   return hb_blob_get_empty ();
 }