From 3c056ae5599be463216fb1883c710157f019acc2 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 6 Feb 2017 09:34:23 -0800 Subject: 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 Reviewed-by: dsinclair --- xfa/fxbarcode/qrcode/BC_QRCoderMode.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'xfa/fxbarcode/qrcode/BC_QRCoderMode.cpp') diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderMode.cpp b/xfa/fxbarcode/qrcode/BC_QRCoderMode.cpp index 87f32edddf..a1283dda93 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCoderMode.cpp +++ b/xfa/fxbarcode/qrcode/BC_QRCoderMode.cpp @@ -98,13 +98,10 @@ CBC_QRCoderMode* CBC_QRCoderMode::ForBits(int32_t bits, int32_t& e) { return sFNC1_SECOND_POSITION; case 0x0D: return sGBK; - default: { + default: e = BCExceptionUnsupportedMode; - if (e != BCExceptionNO) - return nullptr; - } + return nullptr; } - return nullptr; } int32_t CBC_QRCoderMode::GetBits() const { @@ -119,8 +116,7 @@ int32_t CBC_QRCoderMode::GetCharacterCountBits(CBC_QRCoderVersion* version, int32_t& e) const { if (m_characterCountBitsForVersions.empty()) { e = BCExceptionCharacterNotThisMode; - if (e != BCExceptionNO) - return 0; + return 0; } int32_t number = version->GetVersionNumber(); int32_t offset; -- cgit v1.2.3