walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename HB_OT_Layout to hb_ot_layout_t

This commit is contained in:
Behdad Esfahbod 2008-01-28 00:16:49 -05:00
parent dfa8119651
commit e50c3978d3
3 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hb-ot-layout-private.h
View File

@ -49,14 +49,14 @@ HB_BEGIN_DECLS();
*/ */
HB_OT_LAYOUT_INTERNAL hb_bool_t HB_OT_LAYOUT_INTERNAL hb_bool_t
_hb_ot_layout_has_new_glyph_classes (HB_OT_Layout *layout); _hb_ot_layout_has_new_glyph_classes (hb_ot_layout_t *layout);
HB_OT_LAYOUT_INTERNAL hb_ot_layout_glyph_properties_t HB_OT_LAYOUT_INTERNAL hb_ot_layout_glyph_properties_t
_hb_ot_layout_get_glyph_properties (HB_OT_Layout *layout, _hb_ot_layout_get_glyph_properties (hb_ot_layout_t *layout,
hb_glyph_t glyph); hb_glyph_t glyph);
HB_OT_LAYOUT_INTERNAL hb_bool_t HB_OT_LAYOUT_INTERNAL hb_bool_t
_hb_ot_layout_check_glyph_properties (HB_OT_Layout *layout, _hb_ot_layout_check_glyph_properties (hb_ot_layout_t *layout,
HB_GlyphItem gitem, HB_GlyphItem gitem,
hb_ot_layout_lookup_flags_t lookup_flags, hb_ot_layout_lookup_flags_t lookup_flags,
hb_ot_layout_glyph_properties_t *property); hb_ot_layout_glyph_properties_t *property);

22
src/hb-ot-layout.cc
View File

@ -40,7 +40,7 @@
#include <string.h> #include <string.h>
struct _HB_OT_Layout { struct _hb_ot_layout_t {
const GDEF *gdef; const GDEF *gdef;
const GSUB *gsub; const GSUB *gsub;
//const GPOS *gpos; //const GPOS *gpos;
@ -52,11 +52,11 @@ struct _HB_OT_Layout {
}; };
HB_OT_Layout * hb_ot_layout_t *
hb_ot_layout_create_for_data (const char *font_data, hb_ot_layout_create_for_data (const char *font_data,
int face_index) int face_index)
{ {
HB_OT_Layout *layout = (HB_OT_Layout *) calloc (1, sizeof (HB_OT_Layout)); hb_ot_layout_t *layout = (hb_ot_layout_t *) calloc (1, sizeof (hb_ot_layout_t));
const OpenTypeFontFile &font = OpenTypeFontFile::get_for_data (font_data); const OpenTypeFontFile &font = OpenTypeFontFile::get_for_data (font_data);
const OpenTypeFontFace &face = font.get_face (face_index); const OpenTypeFontFace &face = font.get_face (face_index);
@ -69,7 +69,7 @@ hb_ot_layout_create_for_data (const char *font_data,
} }
void void
hb_ot_layout_destroy (HB_OT_Layout *layout) hb_ot_layout_destroy (hb_ot_layout_t *layout)
{ {
free (layout); free (layout);
} }
@ -79,19 +79,19 @@ hb_ot_layout_destroy (HB_OT_Layout *layout)
*/ */
hb_bool_t hb_bool_t
hb_ot_layout_has_font_glyph_classes (HB_OT_Layout *layout) hb_ot_layout_has_font_glyph_classes (hb_ot_layout_t *layout)
{ {
return layout->gdef->has_glyph_classes (); return layout->gdef->has_glyph_classes ();
} }
HB_OT_LAYOUT_INTERNAL hb_bool_t HB_OT_LAYOUT_INTERNAL hb_bool_t
_hb_ot_layout_has_new_glyph_classes (HB_OT_Layout *layout) _hb_ot_layout_has_new_glyph_classes (hb_ot_layout_t *layout)
{ {
return layout->new_gdef.len > 0; return layout->new_gdef.len > 0;
} }
HB_OT_LAYOUT_INTERNAL hb_ot_layout_glyph_properties_t HB_OT_LAYOUT_INTERNAL hb_ot_layout_glyph_properties_t
_hb_ot_layout_get_glyph_properties (HB_OT_Layout *layout, _hb_ot_layout_get_glyph_properties (hb_ot_layout_t *layout,
hb_glyph_t glyph) hb_glyph_t glyph)
{ {
hb_ot_layout_class_t klass; hb_ot_layout_class_t klass;
@ -118,7 +118,7 @@ _hb_ot_layout_get_glyph_properties (HB_OT_Layout *layout,
} }
HB_OT_LAYOUT_INTERNAL hb_bool_t HB_OT_LAYOUT_INTERNAL hb_bool_t
_hb_ot_layout_check_glyph_properties (HB_OT_Layout *layout, _hb_ot_layout_check_glyph_properties (hb_ot_layout_t *layout,
HB_GlyphItem gitem, HB_GlyphItem gitem,
hb_ot_layout_lookup_flags_t lookup_flags, hb_ot_layout_lookup_flags_t lookup_flags,
hb_ot_layout_glyph_properties_t *property) hb_ot_layout_glyph_properties_t *property)
@ -168,7 +168,7 @@ _hb_ot_layout_check_glyph_properties (HB_OT_Layout *layout,
hb_ot_layout_glyph_class_t hb_ot_layout_glyph_class_t
hb_ot_layout_get_glyph_class (HB_OT_Layout *layout, hb_ot_layout_get_glyph_class (hb_ot_layout_t *layout,
hb_glyph_t glyph) hb_glyph_t glyph)
{ {
hb_ot_layout_glyph_properties_t properties; hb_ot_layout_glyph_properties_t properties;
@ -183,7 +183,7 @@ hb_ot_layout_get_glyph_class (HB_OT_Layout *layout,
} }
void void
hb_ot_layout_set_glyph_class (HB_OT_Layout *layout, hb_ot_layout_set_glyph_class (hb_ot_layout_t *layout,
hb_glyph_t glyph, hb_glyph_t glyph,
hb_ot_layout_glyph_class_t klass) hb_ot_layout_glyph_class_t klass)
{ {
@ -224,7 +224,7 @@ hb_ot_layout_set_glyph_class (HB_OT_Layout *layout,
} }
void void
hb_ot_layout_build_glyph_classes (HB_OT_Layout *layout, hb_ot_layout_build_glyph_classes (hb_ot_layout_t *layout,
uint16_t num_total_glyphs, uint16_t num_total_glyphs,
hb_glyph_t *glyphs, hb_glyph_t *glyphs,
unsigned char *klasses, unsigned char *klasses,

23
src/hb-ot-layout.h
View File

@ -32,23 +32,20 @@
HB_BEGIN_DECLS(); HB_BEGIN_DECLS();
/* /*
* HB_OT_Layout * hb_ot_layout_t
*/ */
typedef struct _HB_OT_Layout HB_OT_Layout; typedef struct _hb_ot_layout_t hb_ot_layout_t;
HB_OT_Layout * hb_ot_layout_t *
hb_ot_layout_create_for_data (const char *font_data, hb_ot_layout_create_for_data (const char *font_data,
int face_index); int face_index);
void void
hb_ot_layout_destroy (HB_OT_Layout *layout); hb_ot_layout_destroy (hb_ot_layout_t *layout);
/* TODO /* TODO sanitizing API/constructor (make_wrieable_func_t) */
HB_OT_Layout * /* TODO get_table_func_t constructor */
hb_ot_layout_create_sanitize (char *data,
make_writable_func);
*/
/* /*
* GDEF * GDEF
@ -63,19 +60,19 @@ typedef enum {
} hb_ot_layout_glyph_class_t; } hb_ot_layout_glyph_class_t;
hb_bool_t hb_bool_t
hb_ot_layout_has_font_glyph_classes (HB_OT_Layout *layout); hb_ot_layout_has_font_glyph_classes (hb_ot_layout_t *layout);
hb_ot_layout_glyph_class_t hb_ot_layout_glyph_class_t
hb_ot_layout_get_glyph_class (HB_OT_Layout *layout, hb_ot_layout_get_glyph_class (hb_ot_layout_t *layout,
hb_glyph_t glyph); hb_glyph_t glyph);
void void
hb_ot_layout_set_glyph_class (HB_OT_Layout *layout, hb_ot_layout_set_glyph_class (hb_ot_layout_t *layout,
hb_glyph_t glyph, hb_glyph_t glyph,
hb_ot_layout_glyph_class_t klass); hb_ot_layout_glyph_class_t klass);
void void
hb_ot_layout_build_glyph_classes (HB_OT_Layout *layout, hb_ot_layout_build_glyph_classes (hb_ot_layout_t *layout,
uint16_t num_total_glyphs, uint16_t num_total_glyphs,
hb_glyph_t *glyphs, hb_glyph_t *glyphs,
unsigned char *klasses, unsigned char *klasses,