diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:14:14 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:14:14 -0700 |
commit | 3c012fef2bb72c8ec1faa73e11ee35539b2559d6 (patch) | |
tree | b88cb30a45a615b89cdb380f1f62d270ce540fb9 /core/src/fxcodec/codec/fx_codec_jpeg.cpp | |
parent | 4eb4d7f6c707cc2c23c806aa540d055c8832b55d (diff) | |
download | pdfium-3c012fef2bb72c8ec1faa73e11ee35539b2559d6.tar.xz |
Re-land else-after-returns
Revert "Revert "Fix else-after-returns throughout pdfium.""
This reverts commit 4eb4d7f6c707cc2c23c806aa540d055c8832b55d.
Fix one naming conflict.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1243953004 .
Diffstat (limited to 'core/src/fxcodec/codec/fx_codec_jpeg.cpp')
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpeg.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp index 7666ac6083..b7d9fbe512 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -420,9 +420,11 @@ extern "C" { int ratio = (iratio_w > iratio_h) ? iratio_h : iratio_w; if (ratio >= 8) { return 8; - } else if (ratio >= 4) { + } + if (ratio >= 4) { return 4; - } else if (ratio >= 2) { + } + if (ratio >= 2) { return 2; } return 1; |