diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-29 11:24:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-29 11:24:15 -0700 |
| commit | d5d07dcf59ddc6439f73382c6e0b9e6d1851000d (patch) | |
| tree | 3430639a1c286570a60e946e1b850aeeedaaa05a /xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h | |
| parent | cd1e9ff4f432cbc29ed279e6891fb7ddc2ea3734 (diff) | |
| download | pdfium-d5d07dcf59ddc6439f73382c6e0b9e6d1851000d.tar.xz | |
Replace CFX_PtrArray with typesafe CFX_ArrayTemplate, part 8
This also removes another hand-written bubblesort in favor of
the std::sort() STL function.
Review-Url: https://codereview.chromium.org/1937513002
Diffstat (limited to 'xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h')
| -rw-r--r-- | xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h index 589825fc38..8ef053b334 100644 --- a/xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h +++ b/xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h @@ -10,11 +10,11 @@ #include "core/fxcrt/include/fx_basic.h" class CBC_CommonBitMatrix; -class CBC_WhiteRectangleDetector; -class CBC_ResultPoint; -class CBC_QRDetectorResult; class CBC_DataMatrixDetector; -class ResultPointsAndTransitions; +class CBC_QRDetectorResult; +class CBC_ResultPoint; +class CBC_WhiteRectangleDetector; + class CBC_ResultPointsAndTransitions { public: CBC_ResultPointsAndTransitions(CBC_ResultPoint* from, @@ -25,15 +25,16 @@ class CBC_ResultPointsAndTransitions { m_transitions = transitions; } ~CBC_ResultPointsAndTransitions() {} - CBC_ResultPoint* GetFrom() { return m_from; } - CBC_ResultPoint* GetTo() { return m_to; } - int32_t GetTransitions() { return m_transitions; } + CBC_ResultPoint* GetFrom() const { return m_from; } + CBC_ResultPoint* GetTo() const { return m_to; } + int32_t GetTransitions() const { return m_transitions; } private: CBC_ResultPoint* m_from; CBC_ResultPoint* m_to; int32_t m_transitions; }; + class CBC_DataMatrixDetector { public: CBC_DataMatrixDetector(CBC_CommonBitMatrix* image); @@ -65,7 +66,7 @@ class CBC_DataMatrixDetector { void Increment(CFX_MapPtrTemplate<CBC_ResultPoint*, int32_t>& table, CBC_ResultPoint* key); int32_t Round(FX_FLOAT d); - void OrderBestPatterns(CFX_PtrArray* patterns); + void OrderBestPatterns(CFX_ArrayTemplate<CBC_ResultPoint*>* patterns); virtual void Init(int32_t& e); private: |