summaryrefslogtreecommitdiff
path: root/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2017-02-06 09:34:23 -0800
committerChromium commit bot <commit-bot@chromium.org>2017-02-06 17:56:54 +0000
commit3c056ae5599be463216fb1883c710157f019acc2 (patch)
tree69910ca9c32e06600adbe28bb0cdb0dc50245a64 /xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
parente5f4f22e4c67f40123bca91c2213223cc5a12ebd (diff)
downloadpdfium-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_QRCoderBitVector.cpp')
-rw-r--r--xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp b/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
index bdf73a9841..e4140a87a0 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
+++ b/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
@@ -43,8 +43,7 @@ void CBC_QRCoderBitVector::Clear() {
int32_t CBC_QRCoderBitVector::At(int32_t index, int32_t& e) {
if (index < 0 || index >= m_sizeInBits) {
e = BCExceptionBadIndexException;
- if (e != BCExceptionNO)
- return 0;
+ return 0;
}
int32_t value = m_array[index >> 3] & 0xff;
return (value >> (7 - (index & 0x7))) & 1;
@@ -58,8 +57,7 @@ int32_t CBC_QRCoderBitVector::Size() {
void CBC_QRCoderBitVector::AppendBit(int32_t bit, int32_t& e) {
if (!(bit == 0 || bit == 1)) {
e = BCExceptionBadValueException;
- if (e != BCExceptionNO)
- return;
+ return;
}
int32_t numBitsInLastByte = m_sizeInBits & 0x7;
if (numBitsInLastByte == 0) {
@@ -74,8 +72,7 @@ void CBC_QRCoderBitVector::AppendBits(int32_t value,
int32_t& e) {
if (numBits < 0 || numBits > 32) {
e = BCExceptionBadNumBitsException;
- if (e != BCExceptionNO)
- return;
+ return;
}
int32_t numBitsLeft = numBits;
while (numBitsLeft > 0) {
@@ -107,8 +104,7 @@ void CBC_QRCoderBitVector::AppendBitVector(CBC_QRCoderBitVector* bits,
void CBC_QRCoderBitVector::XOR(CBC_QRCoderBitVector* other, int32_t& e) {
if (m_sizeInBits != other->Size()) {
e = BCExceptioncanNotOperatexorOperator;
- if (e != BCExceptionNO)
- return;
+ return;
}
int32_t sizeInBytes = (m_sizeInBits + 7) >> 3;
for (int32_t i = 0; i < sizeInBytes; ++i) {