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

[name] Change hb_name_id_t back to unsigned int 

d941f66c75 (commitcomment-31076011)
This commit is contained in:
Behdad Esfahbod 2018-10-28 08:26:30 -07:00
parent a4f4f5ba5f
commit 6ce49a921a
6 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/harfbuzz-sections.txt
View File

@ -360,7 +360,6 @@ HB_GOBJECT_TYPE_FONT_FUNCS
HB_GOBJECT_TYPE_GLYPH_FLAGS HB_GOBJECT_TYPE_GLYPH_FLAGS
HB_GOBJECT_TYPE_MAP HB_GOBJECT_TYPE_MAP
HB_GOBJECT_TYPE_MEMORY_MODE HB_GOBJECT_TYPE_MEMORY_MODE
HB_GOBJECT_TYPE_NAME_ID
HB_GOBJECT_TYPE_OT_COLOR_PALETTE_FLAGS HB_GOBJECT_TYPE_OT_COLOR_PALETTE_FLAGS
HB_GOBJECT_TYPE_OT_LAYOUT_GLYPH_CLASS HB_GOBJECT_TYPE_OT_LAYOUT_GLYPH_CLASS
HB_GOBJECT_TYPE_OT_MATH_CONSTANT HB_GOBJECT_TYPE_OT_MATH_CONSTANT
@ -394,7 +393,6 @@ hb_gobject_font_get_type
hb_gobject_glyph_flags_get_type hb_gobject_glyph_flags_get_type
hb_gobject_map_get_type hb_gobject_map_get_type
hb_gobject_memory_mode_get_type hb_gobject_memory_mode_get_type
hb_gobject_name_id_get_type
hb_gobject_ot_color_palette_flags_get_type hb_gobject_ot_color_palette_flags_get_type
hb_gobject_ot_layout_glyph_class_get_type hb_gobject_ot_layout_glyph_class_get_type
hb_gobject_ot_math_constant_get_type hb_gobject_ot_math_constant_get_type

4
src/hb-ot-color-cpal-table.hh
View File

@ -64,7 +64,7 @@ struct CPALV1Tail
unsigned int palette_count) const unsigned int palette_count) const
{ {
if (!paletteLabelsZ) return HB_NAME_ID_INVALID; if (!paletteLabelsZ) return HB_NAME_ID_INVALID;
return (hb_name_id_t) (unsigned) hb_array (base+paletteLabelsZ, palette_count)[palette_index]; return hb_array (base+paletteLabelsZ, palette_count)[palette_index];
} }
inline hb_name_id_t inline hb_name_id_t
@ -73,7 +73,7 @@ struct CPALV1Tail
unsigned int color_count) const unsigned int color_count) const
{ {
if (!colorLabelsZ) return HB_NAME_ID_INVALID; if (!colorLabelsZ) return HB_NAME_ID_INVALID;
return (hb_name_id_t) (unsigned) hb_array (base+colorLabelsZ, color_count)[color_index]; return hb_array (base+colorLabelsZ, color_count)[color_index];
} }
public: public:

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

@ -1075,7 +1075,7 @@ hb_ot_layout_get_size_params (hb_face_t *face,
{ {
if (design_size) *design_size = params.designSize; if (design_size) *design_size = params.designSize;
if (subfamily_id) *subfamily_id = params.subfamilyID; if (subfamily_id) *subfamily_id = params.subfamilyID;
if (subfamily_name_id) *subfamily_name_id = (hb_name_id_t) (unsigned) params.subfamilyNameID; if (subfamily_name_id) *subfamily_name_id = params.subfamilyNameID;
if (range_start) *range_start = params.rangeStart; if (range_start) *range_start = params.rangeStart;
if (range_end) *range_end = params.rangeEnd; if (range_end) *range_end = params.rangeEnd;
@ -1139,7 +1139,7 @@ hb_ot_layout_feature_get_name_ids (hb_face_t *face,
feature_params.get_stylistic_set_params (feature_tag); feature_params.get_stylistic_set_params (feature_tag);
if (&ss_params != &Null (OT::FeatureParamsStylisticSet)) /* ssXX */ if (&ss_params != &Null (OT::FeatureParamsStylisticSet)) /* ssXX */
{ {
if (label_id) *label_id = (hb_name_id_t) (unsigned) ss_params.uiNameID; if (label_id) *label_id = ss_params.uiNameID;
// ssXX features don't have the rest // ssXX features don't have the rest
if (tooltip_id) *tooltip_id = HB_NAME_ID_INVALID; if (tooltip_id) *tooltip_id = HB_NAME_ID_INVALID;
if (sample_id) *sample_id = HB_NAME_ID_INVALID; if (sample_id) *sample_id = HB_NAME_ID_INVALID;
@ -1151,11 +1151,11 @@ hb_ot_layout_feature_get_name_ids (hb_face_t *face,
feature_params.get_character_variants_params (feature_tag); feature_params.get_character_variants_params (feature_tag);
if (&cv_params != &Null (OT::FeatureParamsCharacterVariants)) /* cvXX */ if (&cv_params != &Null (OT::FeatureParamsCharacterVariants)) /* cvXX */
{ {
if (label_id) *label_id = (hb_name_id_t) (unsigned) cv_params.featUILableNameID; if (label_id) *label_id = cv_params.featUILableNameID;
if (tooltip_id) *tooltip_id = (hb_name_id_t) (unsigned) cv_params.featUITooltipTextNameID; if (tooltip_id) *tooltip_id = cv_params.featUITooltipTextNameID;
if (sample_id) *sample_id = (hb_name_id_t) (unsigned) cv_params.sampleTextNameID; if (sample_id) *sample_id = cv_params.sampleTextNameID;
if (num_named_parameters) *num_named_parameters = cv_params.numNamedParameters; if (num_named_parameters) *num_named_parameters = cv_params.numNamedParameters;
if (first_param_id) *first_param_id = (hb_name_id_t) (unsigned) cv_params.firstParamUILabelNameID; if (first_param_id) *first_param_id = cv_params.firstParamUILabelNameID;
return true; return true;
} }
} }

2
src/hb-ot-name-table.hh
View File

@ -194,7 +194,7 @@ struct name
{ {
hb_ot_name_entry_t *entry = this->names.push (); hb_ot_name_entry_t *entry = this->names.push ();
entry->name_id = (hb_name_id_t) (unsigned) all_names[i].nameID; entry->name_id = all_names[i].nameID;
entry->language = all_names[i].language (face); entry->language = all_names[i].language (face);
entry->entry_score = all_names[i].score (); entry->entry_score = all_names[i].score ();
entry->entry_index = i; entry->entry_index = i;

6
src/hb-ot-name.h
View File

@ -44,7 +44,7 @@ HB_BEGIN_DECLS
* *
* Since: 2.0.0 * Since: 2.0.0
**/ **/
typedef enum enum
{ {
HB_NAME_ID_COPYRIGHT = 0, HB_NAME_ID_COPYRIGHT = 0,
HB_NAME_ID_FONT_FAMILY = 1, HB_NAME_ID_FONT_FAMILY = 1,
@ -74,9 +74,9 @@ typedef enum
HB_NAME_ID_VARIATIONS_PS_PREFIX = 25, HB_NAME_ID_VARIATIONS_PS_PREFIX = 25,
HB_NAME_ID_INVALID = 0xFFFF, HB_NAME_ID_INVALID = 0xFFFF,
};
_HB_NAME_ID_MAX_VALUE_SIGNED = 0x7FFFFFFF /*< skip >*/ /* So we get int-sized. */ typedef unsigned int hb_name_id_t;
} hb_name_id_t;
/** /**

2
src/test-size-params.cc
View File

@ -46,7 +46,7 @@ main (int argc, char **argv)
blob = nullptr; blob = nullptr;
unsigned int p[5]; unsigned int p[5];
bool ret = hb_ot_layout_get_size_params (face, p, p+1, (hb_name_id_t *) (p+2), p+3, p+4); bool ret = hb_ot_layout_get_size_params (face, p, p+1, (p+2), p+3, p+4);
printf ("%g %u %u %g %g\n", p[0]/10., p[1], p[2], p[3]/10., p[4]/10.); printf ("%g %u %u %g %g\n", p[0]/10., p[1], p[2], p[3]/10., p[4]/10.);