diff options
| author | tsepez <tsepez@chromium.org> | 2016-10-26 08:45:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-26 08:45:31 -0700 |
| commit | 16b703cb504abedbae3e14f69c1ae355363a7ad8 (patch) | |
| tree | e3561dae57648b23312c06991d96795ef0524b6c /core/fpdfapi/parser/fpdf_parser_decode.cpp | |
| parent | 04c1009af887eb5d3a183dd26421f644f63d8b77 (diff) | |
| download | pdfium-16b703cb504abedbae3e14f69c1ae355363a7ad8.tar.xz | |
Fix some bool/int mismatches.
Found by winxfa bot when fx_bool defined to bool.
Review-Url: https://codereview.chromium.org/2449293002
Diffstat (limited to 'core/fpdfapi/parser/fpdf_parser_decode.cpp')
| -rw-r--r-- | core/fpdfapi/parser/fpdf_parser_decode.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/fpdfapi/parser/fpdf_parser_decode.cpp b/core/fpdfapi/parser/fpdf_parser_decode.cpp index 88712c9760..ed379c7028 100644 --- a/core/fpdfapi/parser/fpdf_parser_decode.cpp +++ b/core/fpdfapi/parser/fpdf_parser_decode.cpp @@ -305,17 +305,18 @@ uint32_t FPDFAPI_FlateOrLZWDecode(FX_BOOL bLZW, uint8_t*& dest_buf, uint32_t& dest_size) { int predictor = 0; + int Colors = 0; + int BitsPerComponent = 0; + int Columns = 0; FX_BOOL bEarlyChange = TRUE; - int Colors = 0, BitsPerComponent = 0, Columns = 0; if (pParams) { predictor = pParams->GetIntegerFor("Predictor"); - bEarlyChange = pParams->GetIntegerFor("EarlyChange", 1); + bEarlyChange = !!pParams->GetIntegerFor("EarlyChange", 1); Colors = pParams->GetIntegerFor("Colors", 1); BitsPerComponent = pParams->GetIntegerFor("BitsPerComponent", 8); Columns = pParams->GetIntegerFor("Columns", 1); - if (!CheckFlateDecodeParams(Colors, BitsPerComponent, Columns)) { + if (!CheckFlateDecodeParams(Colors, BitsPerComponent, Columns)) return (uint32_t)-1; - } } return CPDF_ModuleMgr::Get()->GetFlateModule()->FlateOrLZWDecode( bLZW, src_buf, src_size, bEarlyChange, predictor, Colors, |