Chromium Code Reviews| Index: core/src/fxge/ge/fx_ge_text.cpp |
| diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/src/fxge/ge/fx_ge_text.cpp |
| index 21eebb763002f7aa88ef04639e87b4c0d78d6f6a..28015d6f5e637af4d463fd23b3a156bbfe06ef7a 100644 |
| --- a/core/src/fxge/ge/fx_ge_text.cpp |
| +++ b/core/src/fxge/ge/fx_ge_text.cpp |
| @@ -1189,12 +1189,12 @@ void CFX_Font::AdjustMMParams(int glyph_index, int dest_width, int weight) |
| int min_param = FXFT_Get_MM_Axis_Min(FXFT_Get_MM_Axis(pMasters, 1)) / 65536; |
| int max_param = FXFT_Get_MM_Axis_Max(FXFT_Get_MM_Axis(pMasters, 1)) / 65536; |
| coords[1] = min_param; |
| - int error = FXFT_Set_MM_Design_Coordinates(m_Face, 2, coords); |
| - error = FXFT_Load_Glyph(m_Face, glyph_index, FXFT_LOAD_NO_SCALE | FXFT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH); |
| + FXFT_Set_MM_Design_Coordinates(m_Face, 2, coords); |
|
Lei Zhang
2015/04/17 00:34:10
Maybe we should check here?
Tom Sepez
2015/04/17 16:20:17
Maybe at least:
(void) FXFT_Set_MM_Design_Coo
Lei Zhang
2015/05/08 05:40:38
I'll try to fix this separately later.
|
| + FXFT_Load_Glyph(m_Face, glyph_index, FXFT_LOAD_NO_SCALE | FXFT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH); |
| int min_width = FXFT_Get_Glyph_HoriAdvance(m_Face) * 1000 / FXFT_Get_Face_UnitsPerEM(m_Face); |
| coords[1] = max_param; |
| - error = FXFT_Set_MM_Design_Coordinates(m_Face, 2, coords); |
| - error = FXFT_Load_Glyph(m_Face, glyph_index, FXFT_LOAD_NO_SCALE | FXFT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH); |
| + FXFT_Set_MM_Design_Coordinates(m_Face, 2, coords); |
| + FXFT_Load_Glyph(m_Face, glyph_index, FXFT_LOAD_NO_SCALE | FXFT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH); |
| int max_width = FXFT_Get_Glyph_HoriAdvance(m_Face) * 1000 / FXFT_Get_Face_UnitsPerEM(m_Face); |
| if (max_width == min_width) { |
| return; |