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/fxcodec/codec/fx_codec_flate.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core/src/fxcodec/codec') diff --git a/core/src/fxcodec/codec/fx_codec_flate.cpp b/core/src/fxcodec/codec/fx_codec_flate.cpp index 17f20da1de..ce7c9ade03 100644 --- a/core/src/fxcodec/codec/fx_codec_flate.cpp +++ b/core/src/fxcodec/codec/fx_codec_flate.cpp @@ -6,6 +6,7 @@ #include "codec_int.h" +#include #include #include "core/include/fxcodec/fx_codec.h" @@ -565,7 +566,8 @@ void TIFF_PredictLine(uint8_t* dest_buf, int Colors, int Columns) { if (BitsPerComponent == 1) { - int row_bits = FX_MIN(BitsPerComponent * Colors * Columns, row_size * 8); + int row_bits = std::min(BitsPerComponent * Colors * Columns, + pdfium::base::checked_cast(row_size * 8)); int index_pre = 0; int col_pre = 0; for (int i = 1; i < row_bits; i++) { -- cgit v1.2.3