Chromium Code Reviews| Index: core/fxge/ge/cfx_renderdevice.cpp |
| diff --git a/core/fxge/ge/cfx_renderdevice.cpp b/core/fxge/ge/cfx_renderdevice.cpp |
| index 9c67a7d1e791991c815e768fbd5282acd05ceda4..cad00b9a387a061b5ec7e2487649a65acd6e58f4 100644 |
| --- a/core/fxge/ge/cfx_renderdevice.cpp |
| +++ b/core/fxge/ge/cfx_renderdevice.cpp |
| @@ -1022,13 +1022,14 @@ bool CFX_RenderDevice::DrawNormalText(int nChars, |
| bool bBGRStripe = !!(text_flags & FXTEXT_BGR_STRIPE); |
| ncols /= 3; |
| int x_subpixel = (int)(glyph.m_fOriginX * 3) % 3; |
| - int start_col = std::max(left.ValueOrDie(), 0); |
| + int start_col = std::max(static_cast<int>(left.ValueOrDie<int>()), 0); |
|
dsinclair
2017/01/23 14:46:33
If this is templated as <int> why do we need the c
jschuh
2017/01/23 17:05:19
Because the type returned from ValueOrDie is a Str
Tom Sepez
2017/01/23 18:19:14
done, used functional form rather than template ke
|
| pdfium::base::CheckedNumeric<int> end_col_safe = left; |
| end_col_safe += ncols; |
| if (!end_col_safe.IsValid()) |
| return false; |
| - int end_col = std::min(end_col_safe.ValueOrDie(), dest_width); |
| + int end_col = |
| + std::min(static_cast<int>(end_col_safe.ValueOrDie<int>()), dest_width); |
| if (start_col >= end_col) |
| continue; |