[metrics] _-prefix internal symbol

src/hb-ot-font.cc

@@ -234,9 +234,9 @@ hb_ot_get_font_h_extents (hb_font_t *font,
 			  hb_font_extents_t *metrics,
 			  void *user_data HB_UNUSED)
 {
-  return hb_ot_metrics_get_position_common (font, HB_OT_METRICS_HORIZONTAL_ASCENDER, &metrics->ascender) &&
-	 hb_ot_metrics_get_position_common (font, HB_OT_METRICS_HORIZONTAL_DESCENDER, &metrics->descender) &&
-	 hb_ot_metrics_get_position_common (font, HB_OT_METRICS_HORIZONTAL_LINE_GAP, &metrics->line_gap);
+  return _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_HORIZONTAL_ASCENDER, &metrics->ascender) &&
+	 _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_HORIZONTAL_DESCENDER, &metrics->descender) &&
+	 _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_HORIZONTAL_LINE_GAP, &metrics->line_gap);
 }
 
 static hb_bool_t
@@ -245,9 +245,9 @@ hb_ot_get_font_v_extents (hb_font_t *font,
 			  hb_font_extents_t *metrics,
 			  void *user_data HB_UNUSED)
 {
-  return hb_ot_metrics_get_position_common (font, HB_OT_METRICS_VERTICAL_ASCENDER, &metrics->ascender) &&
-	 hb_ot_metrics_get_position_common (font, HB_OT_METRICS_VERTICAL_DESCENDER, &metrics->descender) &&
-	 hb_ot_metrics_get_position_common (font, HB_OT_METRICS_VERTICAL_LINE_GAP, &metrics->line_gap);
+  return _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_VERTICAL_ASCENDER, &metrics->ascender) &&
+	 _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_VERTICAL_DESCENDER, &metrics->descender) &&
+	 _hb_ot_metrics_get_position_common (font, HB_OT_METRICS_VERTICAL_LINE_GAP, &metrics->line_gap);
 }
 
 #if HB_USE_ATEXIT

src/hb-ot-metrics.cc

@@ -48,7 +48,7 @@ _fix_ascender_descender (float value, hb_ot_metrics_t metrics_tag)
 /* The common part of _get_position logic needed on hb-ot-font and here
    to be able to have slim builds without the not always needed parts */
 bool
-hb_ot_metrics_get_position_common (hb_font_t       *font,
+_hb_ot_metrics_get_position_common (hb_font_t       *font,
 				    hb_ot_metrics_t  metrics_tag,
 				    hb_position_t   *position     /* OUT.  May be NULL. */)
 {
@@ -124,7 +124,7 @@ hb_ot_metrics_get_position (hb_font_t       *font,
   case HB_OT_METRICS_HORIZONTAL_LINE_GAP:
   case HB_OT_METRICS_VERTICAL_ASCENDER:
   case HB_OT_METRICS_VERTICAL_DESCENDER:
-  case HB_OT_METRICS_VERTICAL_LINE_GAP:           return hb_ot_metrics_get_position_common (font, metrics_tag, position);
+  case HB_OT_METRICS_VERTICAL_LINE_GAP:           return _hb_ot_metrics_get_position_common (font, metrics_tag, position);
 #ifndef HB_NO_VAR
 #define GET_VAR hb_ot_metrics_get_variation (face, metrics_tag)
 #else

src/hb-ot-metrics.hh

@@ -28,7 +28,7 @@
 #include "hb.hh"
 
 HB_INTERNAL bool
-hb_ot_metrics_get_position_common (hb_font_t       *font,
+_hb_ot_metrics_get_position_common (hb_font_t       *font,
 				    hb_ot_metrics_t  metrics_tag,
 				    hb_position_t   *position     /* OUT.  May be NULL. */);