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

[Uniscribe] Remove hb_uniscribe_font_ensure() 

Wasn't a huge fan of putting the burden on the user.  Just remove it and
do what we've got to do transparently.
This commit is contained in:
Behdad Esfahbod 2012-07-28 21:16:08 -04:00
parent 5d874d566f
commit a00ad60bc0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hb-uniscribe.cc
View File

@ -58,7 +58,7 @@ DWORD GetFontData(
HB_SHAPER_DATA_ENSURE_DECLARE(uniscribe, face) HB_SHAPER_DATA_ENSURE_DECLARE(uniscribe, face)
HB_SHAPER_DATA_ENSURE_DECLARE(uniscribe, font) HB_SHAPER_DATA_ENSURE_DECLARE(uniscribe, font)
hb_bool_t static hb_bool_t
hb_uniscribe_font_ensure (hb_font_t *font) hb_uniscribe_font_ensure (hb_font_t *font)
{ {
hb_face_t *face = font->face; hb_face_t *face = font->face;
@ -223,6 +223,8 @@ _hb_uniscribe_shaper_shape_plan_data_destroy (hb_uniscribe_shaper_shape_plan_dat
LOGFONTW * LOGFONTW *
hb_uniscribe_font_get_logfontw (hb_font_t *font) hb_uniscribe_font_get_logfontw (hb_font_t *font)
{ {
if (unlikely (!hb_uniscribe_font_ensure (font)))
return NULL;
hb_uniscribe_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font); hb_uniscribe_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font);
return &font_data->log_font; return &font_data->log_font;
} }
@ -230,6 +232,8 @@ hb_uniscribe_font_get_logfontw (hb_font_t *font)
HFONT HFONT
hb_uniscribe_font_get_hfont (hb_font_t *font) hb_uniscribe_font_get_hfont (hb_font_t *font)
{ {
if (unlikely (!hb_uniscribe_font_ensure (font)))
return NULL;
hb_uniscribe_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font); hb_uniscribe_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font);
return font_data->hfont; return font_data->hfont;
} }

4
src/hb-uniscribe.h
View File

@ -34,10 +34,6 @@
HB_BEGIN_DECLS HB_BEGIN_DECLS
/* Must call before all other funtions in this file. Idempotent. */
hb_bool_t
hb_uniscribe_font_ensure (hb_font_t *font);
LOGFONTW * LOGFONTW *
hb_uniscribe_font_get_logfontw (hb_font_t *font); hb_uniscribe_font_get_logfontw (hb_font_t *font);