diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-28 14:56:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-28 14:56:27 -0700 |
| commit | aef780db30c434e1d681d81852fb13160e72ed1e (patch) | |
| tree | 24810c630b3b27649c0dd856d795c0069ca5bcd6 /xfa/fxbarcode/qrcode/BC_QRCoderVersion.h | |
| parent | 8e957baa851aed4b02511d04a66c0f95387d1e10 (diff) | |
| download | pdfium-aef780db30c434e1d681d81852fb13160e72ed1e.tar.xz | |
Replace CFX_PtrArray with typesafe CFX_ArrayTemplate, part 4
Review-Url: https://codereview.chromium.org/1932703003
Diffstat (limited to 'xfa/fxbarcode/qrcode/BC_QRCoderVersion.h')
| -rw-r--r-- | xfa/fxbarcode/qrcode/BC_QRCoderVersion.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h b/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h index 0cbace0251..05bd71934d 100644 --- a/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h +++ b/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h @@ -9,26 +9,11 @@ #include "core/fxcrt/include/fx_basic.h" -class CBC_QRCoderECBlocks; class CBC_CommonBitMatrix; +class CBC_QRCoderECBlocks; class CBC_QRCoderErrorCorrectionLevel; class CBC_QRCoderVersion { - private: - static const int32_t VERSION_DECODE_INFO[34]; - static CFX_PtrArray* VERSION; - int32_t m_versionNumber; - int32_t m_totalCodeWords; - CFX_Int32Array m_alignmentPatternCenters; - CFX_PtrArray m_ecBlocks; - - CBC_QRCoderVersion(); - CBC_QRCoderVersion(int32_t versionNumber, - CBC_QRCoderECBlocks* ecBlocks1, - CBC_QRCoderECBlocks* ecBlocks2, - CBC_QRCoderECBlocks* ecBlocks3, - CBC_QRCoderECBlocks* ecBlocks4); - public: virtual ~CBC_QRCoderVersion(); static void Initialize(); @@ -49,6 +34,22 @@ class CBC_QRCoderVersion { static CBC_QRCoderVersion* DecodeVersionInformation(int32_t versionBits, int32_t& e); static void Destroy(); + + private: + CBC_QRCoderVersion(); + CBC_QRCoderVersion(int32_t versionNumber, + CBC_QRCoderECBlocks* ecBlocks1, + CBC_QRCoderECBlocks* ecBlocks2, + CBC_QRCoderECBlocks* ecBlocks3, + CBC_QRCoderECBlocks* ecBlocks4); + + static const int32_t VERSION_DECODE_INFO[34]; + static CFX_PtrArray* VERSION; + + int32_t m_versionNumber; + int32_t m_totalCodeWords; + CFX_Int32Array m_alignmentPatternCenters; + CFX_ArrayTemplate<CBC_QRCoderECBlocks*> m_ecBlocksArray; }; #endif // XFA_FXBARCODE_QRCODE_BC_QRCODERVERSION_H_ |