diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-02-06 09:34:23 -0800 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-06 17:56:54 +0000 |
| commit | 3c056ae5599be463216fb1883c710157f019acc2 (patch) | |
| tree | 69910ca9c32e06600adbe28bb0cdb0dc50245a64 /xfa/fxbarcode/qrcode/BC_QRCoderVersion.cpp | |
| parent | e5f4f22e4c67f40123bca91c2213223cc5a12ebd (diff) | |
| download | pdfium-3c056ae5599be463216fb1883c710157f019acc2.tar.xz | |
Remove redundant tests exposed by inlining macros in fxbarcode
Remove some unused #defines as well.
Change-Id: Ie7dc1ae85100eae24f18a3ecd456e3c8d8043a43
Reviewed-on: https://pdfium-review.googlesource.com/2490
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxbarcode/qrcode/BC_QRCoderVersion.cpp')
| -rw-r--r-- | xfa/fxbarcode/qrcode/BC_QRCoderVersion.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderVersion.cpp b/xfa/fxbarcode/qrcode/BC_QRCoderVersion.cpp index 58516913bc..befdc17a98 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCoderVersion.cpp +++ b/xfa/fxbarcode/qrcode/BC_QRCoderVersion.cpp @@ -372,8 +372,7 @@ CBC_QRCoderVersion* CBC_QRCoderVersion::GetProvisionalVersionForDimension( int32_t& e) { if ((dimension % 4) != 1) { e = BCExceptionRead; - if (e != BCExceptionNO) - return nullptr; + return nullptr; } CBC_QRCoderVersion* qcv = GetVersionForNumber((dimension - 17) >> 2, e); if (e != BCExceptionNO) @@ -783,8 +782,7 @@ CBC_QRCoderVersion* CBC_QRCoderVersion::GetVersionForNumber( } if (versionNumber < 1 || versionNumber > 40) { e = BCExceptionIllegalArgument; - if (e != BCExceptionNO) - return nullptr; + return nullptr; } return (*VERSION)[versionNumber - 1]; } |