diff options
| author | weili <weili@chromium.org> | 2016-08-09 13:45:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-09 13:45:03 -0700 |
| commit | e76203dbefd1df075a063ee019c3908513f6bee5 (patch) | |
| tree | 2a763852e1d1de3eee6a67285ea96be2874bfb00 /xfa/fxbarcode/pdf417/BC_PDF417.h | |
| parent | ad5ac7584844b03c5ceed082e5f5158a632405cc (diff) | |
| download | pdfium-e76203dbefd1df075a063ee019c3908513f6bee5.tar.xz | |
Use smart pointers for class owned pointers in xfa/fxbarcode
For classes under xfa/fxbarcode, use smart pointers instead
of raw pointer to make memory management easier.
Also fix some styling issues along the changes.
BUG=pdfium:518
Review-Url: https://codereview.chromium.org/2221023003
Diffstat (limited to 'xfa/fxbarcode/pdf417/BC_PDF417.h')
| -rw-r--r-- | xfa/fxbarcode/pdf417/BC_PDF417.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417.h b/xfa/fxbarcode/pdf417/BC_PDF417.h index f2fb5cb89e..eeffc1e6ee 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417.h @@ -7,6 +7,8 @@ #ifndef XFA_FXBARCODE_PDF417_BC_PDF417_H_ #define XFA_FXBARCODE_PDF417_BC_PDF417_H_ +#include <memory> + #include "core/fxcrt/include/fx_basic.h" #include "xfa/fxbarcode/pdf417/BC_PDF417Compaction.h" @@ -16,7 +18,7 @@ class CBC_BarcodeMatrix; class CBC_PDF417 { public: CBC_PDF417(); - CBC_PDF417(FX_BOOL compact); + explicit CBC_PDF417(FX_BOOL compact); virtual ~CBC_PDF417(); CBC_BarcodeMatrix* getBarcodeMatrix(); @@ -34,18 +36,10 @@ class CBC_PDF417 { static const int32_t START_PATTERN = 0x1fea8; static const int32_t STOP_PATTERN = 0x3fa29; static const int32_t CODEWORD_TABLE[][929]; - static FX_FLOAT PREFERRED_RATIO; - static FX_FLOAT DEFAULT_MODULE_WIDTH; - static FX_FLOAT HEIGHT; - CBC_BarcodeMatrix* m_barcodeMatrix; - FX_BOOL m_compact; - Compaction m_compaction; - int32_t m_minCols; - int32_t m_maxCols; - int32_t m_maxRows; - int32_t m_minRows; + static constexpr FX_FLOAT PREFERRED_RATIO = 3.0f; + static constexpr FX_FLOAT DEFAULT_MODULE_WIDTH = 0.357f; + static constexpr FX_FLOAT HEIGHT = 2.0f; - private: static int32_t calculateNumberOfRows(int32_t m, int32_t k, int32_t c); static int32_t getNumberOfPadCodewords(int32_t m, int32_t k, @@ -60,6 +54,14 @@ class CBC_PDF417 { CFX_Int32Array* determineDimensions(int32_t sourceCodeWords, int32_t errorCorrectionCodeWords, int32_t& e); + + std::unique_ptr<CBC_BarcodeMatrix> m_barcodeMatrix; + FX_BOOL m_compact; + Compaction m_compaction; + int32_t m_minCols; + int32_t m_maxCols; + int32_t m_maxRows; + int32_t m_minRows; }; #endif // XFA_FXBARCODE_PDF417_BC_PDF417_H_ |