Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Side by Side Diff: xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp

Issue 1734823002: Get rid of CBC_AutoPtr and use std::unique_ptr instead. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: rebase Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 // Original code is licensed as follows: 6 // Original code is licensed as follows:
7 /* 7 /*
8 * Copyright 2007 ZXing authors 8 * Copyright 2007 ZXing authors
9 * 9 *
10 * Licensed under the Apache License, Version 2.0 (the "License"); 10 * Licensed under the Apache License, Version 2.0 (the "License");
11 * you may not use this file except in compliance with the License. 11 * you may not use this file except in compliance with the License.
12 * You may obtain a copy of the License at 12 * You may obtain a copy of the License at
13 * 13 *
14 * http://www.apache.org/licenses/LICENSE-2.0 14 * http://www.apache.org/licenses/LICENSE-2.0
15 * 15 *
16 * Unless required by applicable law or agreed to in writing, software 16 * Unless required by applicable law or agreed to in writing, software
17 * distributed under the License is distributed on an "AS IS" BASIS, 17 * distributed under the License is distributed on an "AS IS" BASIS,
18 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 18 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
19 * See the License for the specific language governing permissions and 19 * See the License for the specific language governing permissions and
20 * limitations under the License. 20 * limitations under the License.
21 */ 21 */
22 22
23 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h"
24
25 #include <memory>
26
23 #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" 27 #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
24 #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h" 28 #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h"
25 #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" 29 #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
26 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h" 30 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h"
27 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h" 31 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h"
28 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h" 32 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h"
29 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h"
30 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" 33 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h"
31 34
32 CBC_DataMatrixDecoder::CBC_DataMatrixDecoder() { 35 CBC_DataMatrixDecoder::CBC_DataMatrixDecoder() {
33 m_rsDecoder = NULL; 36 m_rsDecoder = NULL;
34 } 37 }
35 void CBC_DataMatrixDecoder::Init() { 38 void CBC_DataMatrixDecoder::Init() {
36 m_rsDecoder = 39 m_rsDecoder =
37 new CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256::DataMatrixField); 40 new CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256::DataMatrixField);
38 } 41 }
39 CBC_DataMatrixDecoder::~CBC_DataMatrixDecoder() { 42 CBC_DataMatrixDecoder::~CBC_DataMatrixDecoder() {
40 delete m_rsDecoder; 43 delete m_rsDecoder;
41 } 44 }
42 CBC_CommonDecoderResult* CBC_DataMatrixDecoder::Decode( 45 CBC_CommonDecoderResult* CBC_DataMatrixDecoder::Decode(
43 CBC_CommonBitMatrix* bits, 46 CBC_CommonBitMatrix* bits,
44 int32_t& e) { 47 int32_t& e) {
45 CBC_DataMatrixBitMatrixParser parser; 48 CBC_DataMatrixBitMatrixParser parser;
46 parser.Init(bits, e); 49 parser.Init(bits, e);
47 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 50 BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
48 CBC_DataMatrixVersion* version = parser.GetVersion(); 51 CBC_DataMatrixVersion* version = parser.GetVersion();
49 CFX_ByteArray* byteTemp = parser.ReadCodewords(e); 52 std::unique_ptr<CFX_ByteArray> codewords(parser.ReadCodewords(e));
50 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 53 BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
51 CBC_AutoPtr<CFX_ByteArray> codewords(byteTemp);
52 CFX_PtrArray* dataBlocks = 54 CFX_PtrArray* dataBlocks =
53 CBC_DataMatrixDataBlock::GetDataBlocks(codewords.get(), version, e); 55 CBC_DataMatrixDataBlock::GetDataBlocks(codewords.get(), version, e);
54 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 56 BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
55 int32_t dataBlocksCount = dataBlocks->GetSize(); 57 int32_t dataBlocksCount = dataBlocks->GetSize();
56 int32_t totalBytes = 0; 58 int32_t totalBytes = 0;
57 int32_t i, j; 59 int32_t i, j;
58 for (i = 0; i < dataBlocksCount; i++) { 60 for (i = 0; i < dataBlocksCount; i++) {
59 totalBytes += 61 totalBytes +=
60 ((CBC_DataMatrixDataBlock*)(*dataBlocks)[i])->GetNumDataCodewords(); 62 ((CBC_DataMatrixDataBlock*)(*dataBlocks)[i])->GetNumDataCodewords();
61 } 63 }
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 int32_t numECCodewords = codewordBytes.GetSize() - numDataCodewords; 105 int32_t numECCodewords = codewordBytes.GetSize() - numDataCodewords;
104 m_rsDecoder->Decode(&codewordsInts, numECCodewords, e); 106 m_rsDecoder->Decode(&codewordsInts, numECCodewords, e);
105 if (e != BCExceptionNO) { 107 if (e != BCExceptionNO) {
106 e = BCExceptionChecksumException; 108 e = BCExceptionChecksumException;
107 return; 109 return;
108 } 110 }
109 for (i = 0; i < numDataCodewords; i++) { 111 for (i = 0; i < numDataCodewords; i++) {
110 codewordBytes[i] = (uint8_t)codewordsInts[i]; 112 codewordBytes[i] = (uint8_t)codewordsInts[i];
111 } 113 }
112 } 114 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698