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

More fixes for SunStudio 12.6 build 

Followup to https://github.com/harfbuzz/harfbuzz/pull/1053
This commit is contained in:
Behdad Esfahbod 2018-06-10 17:22:38 -04:00
parent 498e4373dc
commit b8e406f0c7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-ft.cc
View File

@ -119,7 +119,7 @@ hb_ft_font_set_load_flags (hb_font_t *font, int load_flags)
if (font->immutable) if (font->immutable)
return; return;
if (font->destroy != _hb_ft_font_destroy) if (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy)
return; return;
hb_ft_font_t *ft_font = (hb_ft_font_t *) font->user_data; hb_ft_font_t *ft_font = (hb_ft_font_t *) font->user_data;
@ -139,7 +139,7 @@ hb_ft_font_set_load_flags (hb_font_t *font, int load_flags)
int int
hb_ft_font_get_load_flags (hb_font_t *font) hb_ft_font_get_load_flags (hb_font_t *font)
{ {
if (font->destroy != _hb_ft_font_destroy) if (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy)
return 0; return 0;
const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font->user_data; const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font->user_data;
@ -150,7 +150,7 @@ hb_ft_font_get_load_flags (hb_font_t *font)
FT_Face FT_Face
hb_ft_font_get_face (hb_font_t *font) hb_ft_font_get_face (hb_font_t *font)
{ {
if (font->destroy != _hb_ft_font_destroy) if (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy)
return nullptr; return nullptr;
const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font->user_data; const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font->user_data;
@ -615,7 +615,7 @@ hb_ft_font_create (FT_Face ft_face,
void void
hb_ft_font_changed (hb_font_t *font) hb_ft_font_changed (hb_font_t *font)
{ {
if (font->destroy != _hb_ft_font_destroy) if (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy)
return; return;
hb_ft_font_t *ft_font = (hb_ft_font_t *) font->user_data; hb_ft_font_t *ft_font = (hb_ft_font_t *) font->user_data;

2
src/hb-subset.cc
View File

@ -221,7 +221,7 @@ hb_subset_face_create (void)
hb_bool_t hb_bool_t
hb_subset_face_add_table (hb_face_t *face, hb_tag_t tag, hb_blob_t *blob) hb_subset_face_add_table (hb_face_t *face, hb_tag_t tag, hb_blob_t *blob)
{ {
if (unlikely (face->destroy != _hb_subset_face_data_destroy)) if (unlikely (face->destroy != (hb_destroy_func_t) _hb_subset_face_data_destroy))
return false; return false;
hb_subset_face_data_t *data = (hb_subset_face_data_t *) face->user_data; hb_subset_face_data_t *data = (hb_subset_face_data_t *) face->user_data;