diff options
| author | tsepez <tsepez@chromium.org> | 2016-05-02 13:47:17 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-02 13:47:17 -0700 |
| commit | 6020e45b406e7a130024de87101b4493543f9deb (patch) | |
| tree | e533401947212d7615a2504922caaaa7f450703a /xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp | |
| parent | fbe14b97f00b866e69e0970881550f6d6d9465cd (diff) | |
| download | pdfium-6020e45b406e7a130024de87101b4493543f9deb.tar.xz | |
Replace CFX_PtrArray with typesafe CFX_ArrayTemplate, part 11
Last part. Remove CFX_PtrArray typedef.
Review-Url: https://codereview.chromium.org/1941863002
Diffstat (limited to 'xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp')
| -rw-r--r-- | xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp b/xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp index 2c96f7005f..6a1f46fd02 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp +++ b/xfa/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp @@ -65,7 +65,7 @@ int32_t CBC_PDF417ECErrorCorrection::decode(CFX_Int32Array& received, delete syndrome; return -1; } - CFX_PtrArray* sigmaOmega = + CFX_ArrayTemplate<CBC_PDF417ECModulusPoly*>* sigmaOmega = runEuclideanAlgorithm(buildmonomial, syndrome, numECCodewords, e); delete buildmonomial; delete syndrome; @@ -123,11 +123,11 @@ int32_t CBC_PDF417ECErrorCorrection::decode(CFX_Int32Array& received, delete sigmaOmega; return result; } -CFX_PtrArray* CBC_PDF417ECErrorCorrection::runEuclideanAlgorithm( - CBC_PDF417ECModulusPoly* a, - CBC_PDF417ECModulusPoly* b, - int32_t R, - int32_t& e) { +CFX_ArrayTemplate<CBC_PDF417ECModulusPoly*>* +CBC_PDF417ECErrorCorrection::runEuclideanAlgorithm(CBC_PDF417ECModulusPoly* a, + CBC_PDF417ECModulusPoly* b, + int32_t R, + int32_t& e) { if (a->getDegree() < b->getDegree()) { CBC_PDF417ECModulusPoly* temp = a; a = b; @@ -262,7 +262,8 @@ CFX_PtrArray* CBC_PDF417ECErrorCorrection::runEuclideanAlgorithm( CBC_PDF417ECModulusPoly* omega = r->multiply(inverse, e); delete rtemp; BC_EXCEPTION_CHECK_ReturnValue(e, NULL); - CFX_PtrArray* modulusPoly = new CFX_PtrArray; + CFX_ArrayTemplate<CBC_PDF417ECModulusPoly*>* modulusPoly = + new CFX_ArrayTemplate<CBC_PDF417ECModulusPoly*>(); modulusPoly->Add(sigma); modulusPoly->Add(omega); return modulusPoly; |