From 45fe3c2eefd57b48d7307f9efe13d8019c96e489 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 12 Feb 2016 15:51:59 -0800 Subject: Remove the FX_MIN macro. Bin the min, bin the min, bin the min, bin the min, bin the min, bin the min, bin the min, bin the min, bin the min, bin the min, bin the min, bin the min, bin the min. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1693913003 . --- core/src/fxge/win32/fx_win32_gdipext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/src/fxge') diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp index 1e4f89540b..2d37865437 100644 --- a/core/src/fxge/win32/fx_win32_gdipext.cpp +++ b/core/src/fxge/win32/fx_win32_gdipext.cpp @@ -1302,7 +1302,7 @@ class GpStream final : public IStream { return HRESULT_FROM_WIN32(ERROR_END_OF_MEDIA); } bytes_left = m_InterStream.GetLength() - m_ReadPos; - bytes_out = FX_MIN(cb, bytes_left); + bytes_out = std::min(pdfium::base::checked_cast(cb), bytes_left); FXSYS_memcpy(Output, m_InterStream.GetBuffer() + m_ReadPos, bytes_out); m_ReadPos += (int32_t)bytes_out; if (pcbRead) { -- cgit v1.2.3