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

Side by Side Diff: xfa/src/fxbarcode/qrcode/BC_QRDataBlock.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/qrcode/BC_QRDataBlock.h"
24
25 #include <memory>
26
23 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h" 27 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h"
24 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h" 28 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h"
25 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" 29 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
26 #include "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h"
27 #include "xfa/src/fxbarcode/utils.h" 30 #include "xfa/src/fxbarcode/utils.h"
28 31
29 CBC_QRDataBlock::CBC_QRDataBlock(int32_t numDataCodewords, 32 CBC_QRDataBlock::CBC_QRDataBlock(int32_t numDataCodewords,
30 CFX_ByteArray* codewords) 33 CFX_ByteArray* codewords)
31 : m_numDataCodewords(numDataCodewords), m_codewords(codewords) {} 34 : m_numDataCodewords(numDataCodewords), m_codewords(codewords) {}
32 CBC_QRDataBlock::~CBC_QRDataBlock() { 35 CBC_QRDataBlock::~CBC_QRDataBlock() {
33 delete m_codewords; 36 delete m_codewords;
34 } 37 }
35 int32_t CBC_QRDataBlock::GetNumDataCodewords() { 38 int32_t CBC_QRDataBlock::GetNumDataCodewords() {
36 return m_numDataCodewords; 39 return m_numDataCodewords;
(...skipping 10 matching lines...) Expand all
47 e = BCExceptionIllegalArgument; 50 e = BCExceptionIllegalArgument;
48 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 51 BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
49 } 52 }
50 CBC_QRCoderECBlocks* ecBlocks = version->GetECBlocksForLevel(ecLevel); 53 CBC_QRCoderECBlocks* ecBlocks = version->GetECBlocksForLevel(ecLevel);
51 int32_t totalBlocks = 0; 54 int32_t totalBlocks = 0;
52 CFX_PtrArray* ecBlockArray = ecBlocks->GetECBlocks(); 55 CFX_PtrArray* ecBlockArray = ecBlocks->GetECBlocks();
53 int32_t i = 0; 56 int32_t i = 0;
54 for (i = 0; i < ecBlockArray->GetSize(); i++) { 57 for (i = 0; i < ecBlockArray->GetSize(); i++) {
55 totalBlocks += ((CBC_QRCoderECB*)(*ecBlockArray)[i])->GetCount(); 58 totalBlocks += ((CBC_QRCoderECB*)(*ecBlockArray)[i])->GetCount();
56 } 59 }
57 CFX_PtrArray* datablock = new CFX_PtrArray(); 60 std::unique_ptr<CFX_PtrArray> result(new CFX_PtrArray());
58 datablock->SetSize(totalBlocks); 61 result->SetSize(totalBlocks);
59 CBC_AutoPtr<CFX_PtrArray> result(datablock);
60 int32_t numResultBlocks = 0; 62 int32_t numResultBlocks = 0;
61 for (int32_t j = 0; j < ecBlockArray->GetSize(); j++) { 63 for (int32_t j = 0; j < ecBlockArray->GetSize(); j++) {
62 CBC_QRCoderECB* ecBlock = (CBC_QRCoderECB*)(*ecBlockArray)[j]; 64 CBC_QRCoderECB* ecBlock = (CBC_QRCoderECB*)(*ecBlockArray)[j];
63 for (int32_t k = 0; k < ecBlock->GetCount(); k++) { 65 for (int32_t k = 0; k < ecBlock->GetCount(); k++) {
64 int32_t numDataCodewords = ecBlock->GetDataCodeWords(); 66 int32_t numDataCodewords = ecBlock->GetDataCodeWords();
65 int32_t numBlockCodewords = 67 int32_t numBlockCodewords =
66 ecBlocks->GetECCodeWordsPerBlock() + numDataCodewords; 68 ecBlocks->GetECCodeWordsPerBlock() + numDataCodewords;
67 CFX_ByteArray* bytearray = new CFX_ByteArray(); 69 CFX_ByteArray* bytearray = new CFX_ByteArray();
68 bytearray->SetSize(numBlockCodewords); 70 bytearray->SetSize(numBlockCodewords);
69 (*result)[numResultBlocks++] = 71 (*result)[numResultBlocks++] =
(...skipping 30 matching lines...) Expand all
100 int32_t max = ((CBC_QRDataBlock*)(*result)[0])->m_codewords->GetSize(); 102 int32_t max = ((CBC_QRDataBlock*)(*result)[0])->m_codewords->GetSize();
101 for (i = shorterBlocksNumDataCodewords; i < max; i++) { 103 for (i = shorterBlocksNumDataCodewords; i < max; i++) {
102 for (int32_t y = 0; y < numResultBlocks; y++) { 104 for (int32_t y = 0; y < numResultBlocks; y++) {
103 int32_t iOffset = y < longerBlocksStartAt ? i : i + 1; 105 int32_t iOffset = y < longerBlocksStartAt ? i : i + 1;
104 (*(((CBC_QRDataBlock*)(*result)[y])->m_codewords))[iOffset] = 106 (*(((CBC_QRDataBlock*)(*result)[y])->m_codewords))[iOffset] =
105 (*rawCodewords)[rawCodewordsOffset++]; 107 (*rawCodewords)[rawCodewordsOffset++];
106 } 108 }
107 } 109 }
108 return result.release(); 110 return result.release();
109 } 111 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698