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

[HB] Use nil unicode funcs in nil face

This commit is contained in:
Behdad Esfahbod 2009-08-10 23:21:33 -04:00
parent 48910f8f00
commit af9e104028
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hb-font.cc
View File

@ -27,11 +27,12 @@
#include "hb-private.h" #include "hb-private.h"
#include "hb-font-private.h" #include "hb-font-private.h"
#include "hb-ot-layout-private.h" #include "hb-unicode-private.h"
#include "hb-open-file-private.hh" #include "hb-open-file-private.hh"
#include "hb-blob.h" #include "hb-blob.h"
#include "hb-ot-layout-private.h"
/* /*
* hb_font_funcs_t * hb_font_funcs_t
*/ */
@ -126,7 +127,7 @@ static hb_face_t _hb_face_nil = {
NULL, /* destroy */ NULL, /* destroy */
NULL, /* user_data */ NULL, /* user_data */
NULL /* unicode */ &_hb_unicode_funcs_nil /* unicode */
}; };
hb_face_t * hb_face_t *

3
src/hb-unicode-private.h
View File

@ -47,6 +47,9 @@ struct _hb_unicode_funcs_t {
hb_unicode_get_eastasian_width_func_t get_eastasian_width; hb_unicode_get_eastasian_width_func_t get_eastasian_width;
}; };
HB_INTERNAL hb_unicode_funcs_t
_hb_unicode_funcs_nil;
HB_END_DECLS HB_END_DECLS
#endif /* HB_UNICODE_PRIVATE_H */ #endif /* HB_UNICODE_PRIVATE_H */

2
src/hb-unicode.c
View File

@ -38,7 +38,7 @@ static hb_script_t hb_unicode_get_script_nil (hb_codepoint_t unicode) { return H
static unsigned int hb_unicode_get_combining_class_nil (hb_codepoint_t unicode) { return 0; } static unsigned int hb_unicode_get_combining_class_nil (hb_codepoint_t unicode) { return 0; }
static unsigned int hb_unicode_get_eastasian_width_nil (hb_codepoint_t unicode) { return 1; } static unsigned int hb_unicode_get_eastasian_width_nil (hb_codepoint_t unicode) { return 1; }
static hb_unicode_funcs_t _hb_unicode_funcs_nil = { hb_unicode_funcs_t _hb_unicode_funcs_nil = {
HB_REFERENCE_COUNT_INVALID, /* ref_count */ HB_REFERENCE_COUNT_INVALID, /* ref_count */
hb_unicode_get_general_category_nil, hb_unicode_get_general_category_nil,