Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(824)

Unified Diff: core/src/fxge/ge/fx_ge_text.cpp

Issue 1420103002: Merge to XFA: Remove unused error variable from CFX_Font::AdjustMMParams (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f2ac7129a271dc75c21e513d26edd2d68d1671c8..2f7641ac648e61188c5ea33b13b16b751a142bee 100644
--- a/core/src/fxge/ge/fx_ge_text.cpp
+++ b/core/src/fxge/ge/fx_ge_text.cpp
@@ -1373,20 +1373,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);
- 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 +
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698