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

Side by Side Diff: xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.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_QRBitMatrixParser.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/qrcode/BC_QRBitMatrixParser.h"
25 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h" 28 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h"
26 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" 29 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
27 #include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h" 30 #include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h"
28 #include "xfa/src/fxbarcode/utils.h" 31 #include "xfa/src/fxbarcode/utils.h"
29 32
30 CBC_QRBitMatrixParser::CBC_QRBitMatrixParser() {} 33 CBC_QRBitMatrixParser::CBC_QRBitMatrixParser() {}
31 void CBC_QRBitMatrixParser::Init(CBC_CommonBitMatrix* bitMatrix, int32_t& e) { 34 void CBC_QRBitMatrixParser::Init(CBC_CommonBitMatrix* bitMatrix, int32_t& e) {
32 m_dimension = bitMatrix->GetDimension(e); 35 m_dimension = bitMatrix->GetDimension(e);
33 BC_EXCEPTION_CHECK_ReturnVoid(e); 36 BC_EXCEPTION_CHECK_ReturnVoid(e);
34 m_tempBitMatrix = bitMatrix; 37 m_tempBitMatrix = bitMatrix;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 CBC_QRCoderFormatInformation* formatInfo = ReadFormatInformation(e); 136 CBC_QRCoderFormatInformation* formatInfo = ReadFormatInformation(e);
134 BC_EXCEPTION_CHECK_ReturnValue(e, NULL) CBC_QRCoderVersion* version = 137 BC_EXCEPTION_CHECK_ReturnValue(e, NULL) CBC_QRCoderVersion* version =
135 ReadVersion(e); 138 ReadVersion(e);
136 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 139 BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
137 CBC_QRDataMask* dataMask = 140 CBC_QRDataMask* dataMask =
138 CBC_QRDataMask::ForReference((int32_t)(formatInfo->GetDataMask()), e); 141 CBC_QRDataMask::ForReference((int32_t)(formatInfo->GetDataMask()), e);
139 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 142 BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
140 int32_t dimension = m_bitMatrix->GetDimension(e); 143 int32_t dimension = m_bitMatrix->GetDimension(e);
141 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 144 BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
142 dataMask->UnmaskBitMatirx(m_bitMatrix, dimension); 145 dataMask->UnmaskBitMatirx(m_bitMatrix, dimension);
143 CBC_CommonBitMatrix* cbm = version->BuildFunctionPattern(e); 146 std::unique_ptr<CBC_CommonBitMatrix> functionPattern(
147 version->BuildFunctionPattern(e));
144 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 148 BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
145 CBC_AutoPtr<CBC_CommonBitMatrix> functionPattern(cbm);
146 FX_BOOL readingUp = TRUE; 149 FX_BOOL readingUp = TRUE;
147 CFX_ByteArray* temp = new CFX_ByteArray; 150 std::unique_ptr<CFX_ByteArray> result(new CFX_ByteArray);
148 temp->SetSize(version->GetTotalCodeWords()); 151 result->SetSize(version->GetTotalCodeWords());
149 CBC_AutoPtr<CFX_ByteArray> result(temp);
150 int32_t resultOffset = 0; 152 int32_t resultOffset = 0;
151 int32_t currentByte = 0; 153 int32_t currentByte = 0;
152 int32_t bitsRead = 0; 154 int32_t bitsRead = 0;
153 for (int32_t j = dimension - 1; j > 0; j -= 2) { 155 for (int32_t j = dimension - 1; j > 0; j -= 2) {
154 if (j == 6) { 156 if (j == 6) {
155 j--; 157 j--;
156 } 158 }
157 for (int32_t count = 0; count < dimension; count++) { 159 for (int32_t count = 0; count < dimension; count++) {
158 int32_t i = readingUp ? dimension - 1 - count : count; 160 int32_t i = readingUp ? dimension - 1 - count : count;
159 for (int32_t col = 0; col < 2; col++) { 161 for (int32_t col = 0; col < 2; col++) {
(...skipping 12 matching lines...) Expand all
172 } 174 }
173 } 175 }
174 readingUp ^= TRUE; 176 readingUp ^= TRUE;
175 } 177 }
176 if (resultOffset != version->GetTotalCodeWords()) { 178 if (resultOffset != version->GetTotalCodeWords()) {
177 e = BCExceptionRead; 179 e = BCExceptionRead;
178 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 180 BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
179 } 181 }
180 return result.release(); 182 return result.release();
181 } 183 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698