diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-28 15:16:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-28 15:16:51 -0700 |
| commit | 33a747db5c9ce18bdfaaaaea17b03ef26d14ff54 (patch) | |
| tree | 9d8249844ea44f432891ffa67d7bca51bdb1f033 /xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h | |
| parent | 18713d20e080c344e0ed09e3f0ac5bacb0645fc5 (diff) | |
| download | pdfium-33a747db5c9ce18bdfaaaaea17b03ef26d14ff54.tar.xz | |
Replace CFX_PtrArray with typesafe CFX_ArrayTemplate, Part 5
Remove unused m_pdf417byteSegments, which was coped into from
an empty array and never again referenced.
Review-Url: https://codereview.chromium.org/1927253002
Diffstat (limited to 'xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h')
| -rw-r--r-- | xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h b/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h index ada224787b..60ec184fe4 100644 --- a/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h +++ b/xfa/fxbarcode/qrcode/BC_QRFinderPatternFinder.h @@ -15,16 +15,6 @@ class CBC_ResultPoint; class CBC_QRFinderPatternInfo; class CBC_QRFinderPatternFinder { - private: - static const int32_t CENTER_QUORUM; - static const int32_t MIN_SKIP; - static const int32_t MAX_MODULES; - static const int32_t INTEGER_MATH_SHIFT; - FX_BOOL m_hasSkipped; - CBC_CommonBitMatrix* m_image; - CFX_Int32Array m_crossCheckStateCount; - CFX_PtrArray m_possibleCenters; - public: CBC_QRFinderPatternFinder(CBC_CommonBitMatrix* image); virtual ~CBC_QRFinderPatternFinder(); @@ -33,8 +23,8 @@ class CBC_QRFinderPatternFinder { CBC_QRFinderPatternInfo* Find(int32_t hint, int32_t& e); CFX_Int32Array& GetCrossCheckStateCount(); - CFX_PtrArray* GetPossibleCenters(); - CFX_PtrArray* SelectBestpatterns(int32_t& e); + CFX_ArrayTemplate<CBC_QRFinderPattern*>* GetPossibleCenters(); + CFX_ArrayTemplate<CBC_QRFinderPattern*>* SelectBestpatterns(int32_t& e); FX_BOOL HandlePossibleCenter(const CFX_Int32Array& stateCount, int32_t i, @@ -49,9 +39,21 @@ class CBC_QRFinderPatternFinder { int32_t CenterI, int32_t maxCOunt, int32_t originalStateCountTotal); - static void OrderBestPatterns(CFX_PtrArray* patterns); + static void OrderBestPatterns( + CFX_ArrayTemplate<CBC_QRFinderPattern*>* patterns); static FX_BOOL FoundPatternCross(const CFX_Int32Array& stateCount); static FX_FLOAT Distance(CBC_ResultPoint* point1, CBC_ResultPoint* point2); + + private: + static const int32_t CENTER_QUORUM; + static const int32_t MIN_SKIP; + static const int32_t MAX_MODULES; + static const int32_t INTEGER_MATH_SHIFT; + + FX_BOOL m_hasSkipped; + CBC_CommonBitMatrix* m_image; + CFX_Int32Array m_crossCheckStateCount; + CFX_ArrayTemplate<CBC_QRFinderPattern*> m_possibleCenters; }; #endif // XFA_FXBARCODE_QRCODE_BC_QRFINDERPATTERNFINDER_H_ |