Index: core/fxge/ge/fx_ge_text.cpp |
diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp |
index ca88879d1087c2d4607e65cc29292f1b29fafe5c..3c919c44f525ac6109078299cc8b25a7c899dcaf 100644 |
--- a/core/fxge/ge/fx_ge_text.cpp |
+++ b/core/fxge/ge/fx_ge_text.cpp |
@@ -79,10 +79,14 @@ FX_RECT FXGE_GetGlyphsBBox(const std::vector<FXTEXT_GLYPHPOS>& glyphs, |
continue; |
if (bStarted) { |
- rect.left = std::min(rect.left, char_left.ValueOrDie()); |
- rect.right = std::max(rect.right, char_right.ValueOrDie()); |
- rect.top = std::min(rect.top, char_top.ValueOrDie()); |
- rect.bottom = std::max(rect.bottom, char_bottom.ValueOrDie()); |
+ rect.left = |
+ std::min(rect.left, static_cast<int>(char_left.ValueOrDie<int>())); |
jschuh
2017/01/23 17:05:19
Same as above. This is what CheckMax() is for.
Tom Sepez
2017/01/23 18:19:14
Done.
|
+ rect.right = |
+ std::max(rect.right, static_cast<int>(char_right.ValueOrDie<int>())); |
+ rect.top = |
+ std::min(rect.top, static_cast<int>(char_top.ValueOrDie<int>())); |
+ rect.bottom = std::max(rect.bottom, |
+ static_cast<int>(char_bottom.ValueOrDie<int>())); |
continue; |
} |