diff options
| author | Nico Weber <thakis@chromium.org> | 2015-08-04 13:00:21 -0700 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2015-08-04 13:00:21 -0700 |
| commit | 9d8ec5a6e37e8d1d4d4edca9040de234e2d4728f (patch) | |
| tree | c97037f398d714665aefccb6eb54d0969ad7030c /xfa/src/fxbarcode/common/BC_CommonBitSource.cpp | |
| parent | 780cee82236d1b3b0f9b01a22424e4b8ec9a6f12 (diff) | |
| download | pdfium-9d8ec5a6e37e8d1d4d4edca9040de234e2d4728f.tar.xz | |
XFA: clang-format all pdfium code.
No behavior change.
Generated by:
find . -name '*.cpp' -o -name '*.h' | \
grep -E -v 'third_party|thirdparties|lpng_v163|tiff_v403' | \
xargs ../../buildtools/mac/clang-format -i
Then manually merged https://codereview.chromium.org/1269223002/
See thread "tabs vs spaces" on pdfium@googlegroups.com for discussion.
BUG=none
Diffstat (limited to 'xfa/src/fxbarcode/common/BC_CommonBitSource.cpp')
| -rw-r--r-- | xfa/src/fxbarcode/common/BC_CommonBitSource.cpp | 83 |
1 files changed, 39 insertions, 44 deletions
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp index f32d634a5a..20b0d2accc 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp @@ -22,55 +22,50 @@ #include "../barcode.h"
#include "BC_CommonBitSource.h"
-CBC_CommonBitSource::CBC_CommonBitSource(CFX_ByteArray* bytes)
-{
- m_bytes.Copy((*bytes));
- m_bitOffset = 0;
- m_byteOffset = 0;
+CBC_CommonBitSource::CBC_CommonBitSource(CFX_ByteArray* bytes) {
+ m_bytes.Copy((*bytes));
+ m_bitOffset = 0;
+ m_byteOffset = 0;
}
-CBC_CommonBitSource::~CBC_CommonBitSource()
-{
-}
-int32_t CBC_CommonBitSource::ReadBits(int32_t numBits, int32_t &e)
-{
- if (numBits < 1 || numBits > 32) {
- e = BCExceptionIllegalArgument;
- return 0;
+CBC_CommonBitSource::~CBC_CommonBitSource() {}
+int32_t CBC_CommonBitSource::ReadBits(int32_t numBits, int32_t& e) {
+ if (numBits < 1 || numBits > 32) {
+ e = BCExceptionIllegalArgument;
+ return 0;
+ }
+ int32_t result = 0;
+ if (m_bitOffset > 0) {
+ int32_t bitsLeft = 8 - m_bitOffset;
+ int32_t toRead = numBits < bitsLeft ? numBits : bitsLeft;
+ int32_t bitsToNotRead = bitsLeft - toRead;
+ int32_t mask = (0xff >> (8 - toRead)) << bitsToNotRead;
+ result = (m_bytes[m_byteOffset] & mask) >> bitsToNotRead;
+ numBits -= toRead;
+ m_bitOffset += toRead;
+ if (m_bitOffset == 8) {
+ m_bitOffset = 0;
+ m_byteOffset++;
}
- int32_t result = 0;
- if (m_bitOffset > 0) {
- int32_t bitsLeft = 8 - m_bitOffset;
- int32_t toRead = numBits < bitsLeft ? numBits : bitsLeft;
- int32_t bitsToNotRead = bitsLeft - toRead;
- int32_t mask = (0xff >> (8 - toRead)) << bitsToNotRead;
- result = (m_bytes[m_byteOffset] & mask) >> bitsToNotRead;
- numBits -= toRead;
- m_bitOffset += toRead;
- if (m_bitOffset == 8) {
- m_bitOffset = 0;
- m_byteOffset++;
- }
+ }
+ if (numBits > 0) {
+ while (numBits >= 8) {
+ result = (result << 8) | (m_bytes[m_byteOffset] & 0xff);
+ m_byteOffset++;
+ numBits -= 8;
}
if (numBits > 0) {
- while(numBits >= 8) {
- result = (result << 8) | (m_bytes[m_byteOffset] & 0xff);
- m_byteOffset++;
- numBits -= 8;
- }
- if (numBits > 0) {
- int32_t bitsToNotRead = 8 - numBits;
- int32_t mask = (0xff >> bitsToNotRead) << bitsToNotRead;
- result = (result << numBits) | ((m_bytes[m_byteOffset] & mask) >> bitsToNotRead);
- m_bitOffset += numBits;
- }
+ int32_t bitsToNotRead = 8 - numBits;
+ int32_t mask = (0xff >> bitsToNotRead) << bitsToNotRead;
+ result = (result << numBits) |
+ ((m_bytes[m_byteOffset] & mask) >> bitsToNotRead);
+ m_bitOffset += numBits;
}
- return result;
+ }
+ return result;
}
-int32_t CBC_CommonBitSource::Available()
-{
- return 8 * (m_bytes.GetSize() - m_byteOffset) - m_bitOffset;
+int32_t CBC_CommonBitSource::Available() {
+ return 8 * (m_bytes.GetSize() - m_byteOffset) - m_bitOffset;
}
-int32_t CBC_CommonBitSource::getByteOffset()
-{
- return m_byteOffset;
+int32_t CBC_CommonBitSource::getByteOffset() {
+ return m_byteOffset;
}
|