Index: third_party/harfbuzz-ng/src/hb-ot-layout-private.hh |
diff --git a/third_party/harfbuzz-ng/src/hb-ot-layout-private.hh b/third_party/harfbuzz-ng/src/hb-ot-layout-private.hh |
index b0088fbd7d0e1c484c6119e6e54ee90b2be07f64..bf7e43b6e4dd51065a14bcba558dbede23c63195 100644 |
--- a/third_party/harfbuzz-ng/src/hb-ot-layout-private.hh |
+++ b/third_party/harfbuzz-ng/src/hb-ot-layout-private.hh |
@@ -1,5 +1,5 @@ |
/* |
- * Copyright (C) 2007,2008,2009 Red Hat, Inc. |
+ * Copyright © 2007,2008,2009 Red Hat, Inc. |
* |
* This is part of HarfBuzz, a text shaping library. |
* |
@@ -27,21 +27,22 @@ |
#ifndef HB_OT_LAYOUT_PRIVATE_HH |
#define HB_OT_LAYOUT_PRIVATE_HH |
-#include "hb-private.h" |
+#include "hb-private.hh" |
#include "hb-ot-layout.h" |
-#include "hb-ot-head-private.hh" |
-#include "hb-font-private.h" |
+#include "hb-font-private.hh" |
#include "hb-buffer-private.hh" |
-HB_BEGIN_DECLS |
+/* |
+ * GDEF |
+ */ |
+ |
/* buffer var allocations */ |
#define props_cache() var1.u16[1] /* glyph_props cache */ |
- |
/* XXX cleanup */ |
typedef enum { |
HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED = 0x0001, |
@@ -52,6 +53,24 @@ typedef enum { |
} hb_ot_layout_glyph_class_t; |
+HB_INTERNAL unsigned int |
+_hb_ot_layout_get_glyph_property (hb_face_t *face, |
+ hb_glyph_info_t *info); |
+ |
+HB_INTERNAL hb_bool_t |
+_hb_ot_layout_check_glyph_property (hb_face_t *face, |
+ hb_glyph_info_t *ginfo, |
+ unsigned int lookup_props, |
+ unsigned int *property_out); |
+ |
+HB_INTERNAL hb_bool_t |
+_hb_ot_layout_skip_mark (hb_face_t *face, |
+ hb_glyph_info_t *ginfo, |
+ unsigned int lookup_props, |
+ unsigned int *property_out); |
+ |
+ |
+ |
/* |
* hb_ot_layout_t |
*/ |
@@ -67,48 +86,13 @@ struct hb_ot_layout_t |
const struct GPOS *gpos; |
}; |
-struct hb_ot_layout_context_t |
-{ |
- hb_face_t *face; |
- hb_font_t *font; |
- |
- /* Convert from font-space to user-space */ |
- inline hb_position_t scale_x (int16_t v) { return scale (v, this->font->x_scale); } |
- inline hb_position_t scale_y (int16_t v) { return scale (v, this->font->y_scale); } |
- |
- private: |
- inline hb_position_t scale (int16_t v, unsigned int scale) { return v * (int64_t) scale / this->face->head_table->get_upem (); } |
-}; |
- |
HB_INTERNAL hb_ot_layout_t * |
-_hb_ot_layout_new (hb_face_t *face); |
+_hb_ot_layout_create (hb_face_t *face); |
HB_INTERNAL void |
-_hb_ot_layout_free (hb_ot_layout_t *layout); |
- |
- |
-/* |
- * GDEF |
- */ |
- |
-HB_INTERNAL unsigned int |
-_hb_ot_layout_get_glyph_property (hb_face_t *face, |
- hb_glyph_info_t *info); |
- |
-HB_INTERNAL hb_bool_t |
-_hb_ot_layout_check_glyph_property (hb_face_t *face, |
- hb_glyph_info_t *ginfo, |
- unsigned int lookup_props, |
- unsigned int *property_out); |
- |
-HB_INTERNAL hb_bool_t |
-_hb_ot_layout_skip_mark (hb_face_t *face, |
- hb_glyph_info_t *ginfo, |
- unsigned int lookup_props, |
- unsigned int *property_out); |
+_hb_ot_layout_destroy (hb_ot_layout_t *layout); |
-HB_END_DECLS |
#endif /* HB_OT_LAYOUT_PRIVATE_HH */ |