From d5d07dcf59ddc6439f73382c6e0b9e6d1851000d Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 29 Apr 2016 11:24:14 -0700 Subject: 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 --- xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h') diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h b/xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h index 039255268f..782e5ed319 100644 --- a/xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h +++ b/xfa/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h @@ -11,22 +11,23 @@ class CBC_DataMatrixVersion; -class CBC_DataMatrixDataBlock { +class CBC_DataMatrixDataBlock final { public: - virtual ~CBC_DataMatrixDataBlock(); + ~CBC_DataMatrixDataBlock(); int32_t GetNumDataCodewords(); CFX_ByteArray* GetCodewords(); - static CFX_PtrArray* GetDataBlocks(CFX_ByteArray* rawCodewords, - CBC_DataMatrixVersion* version, - int32_t& e); + static CFX_ArrayTemplate* GetDataBlocks( + CFX_ByteArray* rawCodewords, + CBC_DataMatrixVersion* version, + int32_t& e); private: + CBC_DataMatrixDataBlock(int32_t numDataCodewords, CFX_ByteArray* codewords); + int32_t m_numDataCodewords; CFX_ByteArray m_codewords; - - CBC_DataMatrixDataBlock(int32_t numDataCodewords, CFX_ByteArray* codewords); }; #endif // XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXDATABLOCK_H_ -- cgit v1.2.3