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 11bc29ef5be28365bec38fd18a07af384a4f5178..6cc9790e569647bc74f9ed3e7de28961f8830875 100644 |
| --- a/core/src/fxge/ge/fx_ge_text.cpp |
| +++ b/core/src/fxge/ge/fx_ge_text.cpp |
| @@ -1401,20 +1401,21 @@ 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); |
|
Lei Zhang
2015/10/22 18:53:40
Uh, we had plans to actually check |error|. See ht
Oliver Chang
2015/10/22 18:58:55
Sure, I wasn't sure if it was worth rewriting the
|
| - error = FXFT_Load_Glyph( |
| + (void)FXFT_Set_MM_Design_Coordinates(m_Face, 2, coords); |
| + (void)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( |
| + (void)FXFT_Set_MM_Design_Coordinates(m_Face, 2, coords); |
| + (void)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) { |
| + FXFT_Free(m_Face, pMasters); |
| return; |
| } |
| int param = min_param + |