diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-03-21 12:26:54 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-03-21 12:26:54 -0700 |
| commit | 4161c5ca6c5438476bf07b6dacfafb61ea611cc5 (patch) | |
| tree | 76b021ad93546c362d6e6089c18e362aebe247aa /xfa/fxbarcode/qrcode | |
| parent | a98600aeb8d815c297834aa5006f5c3ea20dde6d (diff) | |
| download | pdfium-4161c5ca6c5438476bf07b6dacfafb61ea611cc5.tar.xz | |
Make a few more const tables smaller.chromium/2689chromium/2688
Remove some tables from .h file (risk of duplication).
R=ochang@chromium.org
Review URL: https://codereview.chromium.org/1814233005 .
Diffstat (limited to 'xfa/fxbarcode/qrcode')
| -rw-r--r-- | xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp | 27 | ||||
| -rw-r--r-- | xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.h | 6 |
2 files changed, 17 insertions, 16 deletions
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp b/xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp index da647a9c53..f915e58aae 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp +++ b/xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp @@ -24,18 +24,19 @@ #include "xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.h" #include "xfa/fxbarcode/utils.h" -const int32_t CBC_QRCoderFormatInformation::FORMAT_INFO_MASK_QR = 0X5412; -const int32_t CBC_QRCoderFormatInformation::FORMAT_INFO_DECODE_LOOKUP[32][2] = { - {0x5412, 0x00}, {0x5125, 0x01}, {0x5E7C, 0x02}, {0x5B4B, 0x03}, - {0x45F9, 0x04}, {0x40CE, 0x05}, {0x4F97, 0x06}, {0x4AA0, 0x07}, - {0x77C4, 0x08}, {0x72F3, 0x09}, {0x7DAA, 0x0A}, {0x789D, 0x0B}, - {0x662F, 0x0C}, {0x6318, 0x0D}, {0x6C41, 0x0E}, {0x6976, 0x0F}, - {0x1689, 0x10}, {0x13BE, 0x11}, {0x1CE7, 0x12}, {0x19D0, 0x13}, - {0x0762, 0x14}, {0x0255, 0x15}, {0x0D0C, 0x16}, {0x083B, 0x17}, - {0x355F, 0x18}, {0x3068, 0x19}, {0x3F31, 0x1A}, {0x3A06, 0x1B}, - {0x24B4, 0x1C}, {0x2183, 0x1D}, {0x2EDA, 0x1E}, {0x2BED, 0x1F}, +const uint16_t CBC_QRCoderFormatInformation::FORMAT_INFO_MASK_QR = 0X5412; +const uint16_t CBC_QRCoderFormatInformation::FORMAT_INFO_DECODE_LOOKUP[32][2] = + { + {0x5412, 0x00}, {0x5125, 0x01}, {0x5E7C, 0x02}, {0x5B4B, 0x03}, + {0x45F9, 0x04}, {0x40CE, 0x05}, {0x4F97, 0x06}, {0x4AA0, 0x07}, + {0x77C4, 0x08}, {0x72F3, 0x09}, {0x7DAA, 0x0A}, {0x789D, 0x0B}, + {0x662F, 0x0C}, {0x6318, 0x0D}, {0x6C41, 0x0E}, {0x6976, 0x0F}, + {0x1689, 0x10}, {0x13BE, 0x11}, {0x1CE7, 0x12}, {0x19D0, 0x13}, + {0x0762, 0x14}, {0x0255, 0x15}, {0x0D0C, 0x16}, {0x083B, 0x17}, + {0x355F, 0x18}, {0x3068, 0x19}, {0x3F31, 0x1A}, {0x3A06, 0x1B}, + {0x24B4, 0x1C}, {0x2183, 0x1D}, {0x2EDA, 0x1E}, {0x2BED, 0x1F}, }; -const int32_t CBC_QRCoderFormatInformation::BITS_SET_IN_HALF_BYTE[] = { +const uint8_t CBC_QRCoderFormatInformation::BITS_SET_IN_HALF_BYTE[] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4}; CBC_QRCoderFormatInformation::CBC_QRCoderFormatInformation(int32_t formatInfo) { @@ -77,8 +78,8 @@ CBC_QRCoderFormatInformation::DoDecodeFormatInformation( int32_t bestDifference = (int32_t)FXSYS_nan(); int32_t bestFormatInfo = 0; for (int32_t i = 0; i < 32; i++) { - int32_t const* decodeInfo = &FORMAT_INFO_DECODE_LOOKUP[i][0]; - int32_t targetInfo = decodeInfo[0]; + uint16_t const* decodeInfo = &FORMAT_INFO_DECODE_LOOKUP[i][0]; + uint16_t targetInfo = decodeInfo[0]; if (targetInfo == maskedFormatInfo) { return new CBC_QRCoderFormatInformation(decodeInfo[1]); } diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.h b/xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.h index 8f1590172e..a988d3bd6b 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.h +++ b/xfa/fxbarcode/qrcode/BC_QRCoderFormatInformation.h @@ -10,9 +10,9 @@ class CBC_QRCoderErrorCorrectionLevel; class CBC_QRCoderFormatInformation { private: - static const int32_t FORMAT_INFO_MASK_QR; - static const int32_t FORMAT_INFO_DECODE_LOOKUP[32][2]; - static const int32_t BITS_SET_IN_HALF_BYTE[16]; + static const uint16_t FORMAT_INFO_MASK_QR; + static const uint16_t FORMAT_INFO_DECODE_LOOKUP[32][2]; + static const uint8_t BITS_SET_IN_HALF_BYTE[16]; CBC_QRCoderErrorCorrectionLevel* m_errorCorrectLevl; uint8_t m_dataMask; |