From 574579d3766b7b42e62495cb9a98f3ffd91079e8 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 28 Oct 2018 23:04:37 -0700 Subject: [PATCH] [color] Rename get_strike() to choose_strike() --- src/hb-ot-color-cbdt-table.hh | 8 ++++---- src/hb-ot-color-sbix-table.hh | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/hb-ot-color-cbdt-table.hh b/src/hb-ot-color-cbdt-table.hh index e6a78200a..c30f36c4d 100644 --- a/src/hb-ot-color-cbdt-table.hh +++ b/src/hb-ot-color-cbdt-table.hh @@ -343,8 +343,8 @@ struct CBLC } protected: - const BitmapSizeTable &get_strike (hb_font_t *font, - unsigned int *x_ppem, unsigned int *y_ppem) const + const BitmapSizeTable &choose_strike (hb_font_t *font, + unsigned int *x_ppem, unsigned int *y_ppem) const { /* TODO: Make it possible to select strike. */ @@ -405,7 +405,7 @@ struct CBDT unsigned int x_ppem, y_ppem; const void *base; - const BitmapSizeTable &strike = this->cblc->get_strike (font, &x_ppem, &y_ppem); + const BitmapSizeTable &strike = this->cblc->choose_strike (font, &x_ppem, &y_ppem); const IndexSubtableRecord *subtable_record = strike.find_table (glyph, cblc, &base); if (!subtable_record || !x_ppem || !y_ppem) return false; @@ -457,7 +457,7 @@ struct CBDT unsigned int x_ppem, y_ppem; const void *base; - const BitmapSizeTable &strike = this->cblc->get_strike (font, &x_ppem, &y_ppem); + const BitmapSizeTable &strike = this->cblc->choose_strike (font, &x_ppem, &y_ppem); const IndexSubtableRecord *subtable_record = strike.find_table (glyph, cblc, &base); if (!subtable_record || !x_ppem || !y_ppem) return hb_blob_get_empty (); diff --git a/src/hb-ot-color-sbix-table.hh b/src/hb-ot-color-sbix-table.hh index 7bde38a6a..4a14a69d2 100644 --- a/src/hb-ot-color-sbix-table.hh +++ b/src/hb-ot-color-sbix-table.hh @@ -172,15 +172,15 @@ struct sbix int *y_offset, unsigned int *available_ppem) const { - return get_strike (font).get_glyph_blob (glyph_id, sbix_blob, - HB_TAG ('p','n','g',' '), - x_offset, y_offset, - num_glyphs, available_ppem); + return choose_strike (font).get_glyph_blob (glyph_id, sbix_blob, + HB_TAG ('p','n','g',' '), + x_offset, y_offset, + num_glyphs, available_ppem); } private: - inline const SBIXStrike &get_strike (hb_font_t *font) const + inline const SBIXStrike &choose_strike (hb_font_t *font) const { if (unlikely (!table->strikes.len)) return Null(SBIXStrike);