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/common/BC_WhiteRectangleDetector.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/common/BC_WhiteRectangleDetector.h')
-rw-r--r-- | xfa/fxbarcode/common/BC_WhiteRectangleDetector.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/xfa/fxbarcode/common/BC_WhiteRectangleDetector.h b/xfa/fxbarcode/common/BC_WhiteRectangleDetector.h index d713d0fa99..f3ac77a9c0 100644 --- a/xfa/fxbarcode/common/BC_WhiteRectangleDetector.h +++ b/xfa/fxbarcode/common/BC_WhiteRectangleDetector.h @@ -20,9 +20,10 @@ class CBC_WhiteRectangleDetector { int32_t x, int32_t y); virtual ~CBC_WhiteRectangleDetector(); - CFX_PtrArray* Detect(int32_t& e); virtual void Init(int32_t& e); + CFX_ArrayTemplate<CBC_ResultPoint*>* Detect(int32_t& e); + private: int32_t Round(float d); CBC_ResultPoint* GetBlackPointOnSegment(FX_FLOAT aX, @@ -30,10 +31,11 @@ class CBC_WhiteRectangleDetector { FX_FLOAT bX, FX_FLOAT bY); int32_t DistanceL2(FX_FLOAT aX, FX_FLOAT aY, FX_FLOAT bX, FX_FLOAT bY); - CFX_PtrArray* CenterEdges(CBC_ResultPoint* y, - CBC_ResultPoint* z, - CBC_ResultPoint* x, - CBC_ResultPoint* t); + CFX_ArrayTemplate<CBC_ResultPoint*>* CenterEdges(CBC_ResultPoint* y, + CBC_ResultPoint* z, + CBC_ResultPoint* x, + CBC_ResultPoint* t) const; + FX_BOOL ContainsBlackPoint(int32_t a, int32_t b, int32_t fixed, |