Commit d22d6529 authored by ckocagil@chromium.org's avatar ckocagil@chromium.org

Explicitly cast from HarfBuzz type to shorter type

This allows the file to be compiled with C++11.

BUG=

Review URL: https://codereview.chromium.org/316113002

git-svn-id: svn://svn.chromium.org/blink/trunk@175606 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 6f6d8c88
...@@ -128,7 +128,7 @@ static hb_position_t harfBuzzGetGlyphHorizontalKerning(hb_font_t*, void* fontDat ...@@ -128,7 +128,7 @@ static hb_position_t harfBuzzGetGlyphHorizontalKerning(hb_font_t*, void* fontDat
SkTypeface* typeface = hbFontData->m_paint.getTypeface(); SkTypeface* typeface = hbFontData->m_paint.getTypeface();
const uint16_t glyphs[2] = { leftGlyph, rightGlyph }; const uint16_t glyphs[2] = { static_cast<uint16_t>(leftGlyph), static_cast<uint16_t>(rightGlyph) };
int32_t kerningAdjustments[1] = { 0 }; int32_t kerningAdjustments[1] = { 0 };
if (typeface->getKerningPairAdjustments(glyphs, 2, kerningAdjustments)) { if (typeface->getKerningPairAdjustments(glyphs, 2, kerningAdjustments)) {
...@@ -150,7 +150,7 @@ static hb_position_t harfBuzzGetGlyphVerticalKerning(hb_font_t*, void* fontData, ...@@ -150,7 +150,7 @@ static hb_position_t harfBuzzGetGlyphVerticalKerning(hb_font_t*, void* fontData,
SkTypeface* typeface = hbFontData->m_paint.getTypeface(); SkTypeface* typeface = hbFontData->m_paint.getTypeface();
const uint16_t glyphs[2] = { topGlyph, bottomGlyph }; const uint16_t glyphs[2] = { static_cast<uint16_t>(topGlyph), static_cast<uint16_t>(bottomGlyph) };
int32_t kerningAdjustments[1] = { 0 }; int32_t kerningAdjustments[1] = { 0 };
if (typeface->getKerningPairAdjustments(glyphs, 2, kerningAdjustments)) { if (typeface->getKerningPairAdjustments(glyphs, 2, kerningAdjustments)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment