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

Side by Side Diff: xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.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_DataMatrixBitMatrixParser.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/datamatrix/BC_DataMatrixBitMatrixParser.h"
25 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" 28 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h"
26 #include "xfa/src/fxbarcode/utils.h" 29 #include "xfa/src/fxbarcode/utils.h"
27 30
28 CBC_DataMatrixBitMatrixParser::CBC_DataMatrixBitMatrixParser() { 31 CBC_DataMatrixBitMatrixParser::CBC_DataMatrixBitMatrixParser() {
29 m_mappingBitMatrix = NULL; 32 m_mappingBitMatrix = NULL;
30 m_version = NULL; 33 m_version = NULL;
31 m_readMappingMatrix = NULL; 34 m_readMappingMatrix = NULL;
32 } 35 }
33 void CBC_DataMatrixBitMatrixParser::Init(CBC_CommonBitMatrix* bitMatrix, 36 void CBC_DataMatrixBitMatrixParser::Init(CBC_CommonBitMatrix* bitMatrix,
34 int32_t& e) { 37 int32_t& e) {
(...skipping 21 matching lines...) Expand all
56 CBC_CommonBitMatrix* bitMatrix, 59 CBC_CommonBitMatrix* bitMatrix,
57 int32_t& e) { 60 int32_t& e) {
58 int32_t rows = bitMatrix->GetHeight(); 61 int32_t rows = bitMatrix->GetHeight();
59 int32_t columns = bitMatrix->GetWidth(); 62 int32_t columns = bitMatrix->GetWidth();
60 CBC_DataMatrixVersion* temp = 63 CBC_DataMatrixVersion* temp =
61 CBC_DataMatrixVersion::GetVersionForDimensions(rows, columns, e); 64 CBC_DataMatrixVersion::GetVersionForDimensions(rows, columns, e);
62 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 65 BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
63 return temp; 66 return temp;
64 } 67 }
65 CFX_ByteArray* CBC_DataMatrixBitMatrixParser::ReadCodewords(int32_t& e) { 68 CFX_ByteArray* CBC_DataMatrixBitMatrixParser::ReadCodewords(int32_t& e) {
66 CBC_AutoPtr<CFX_ByteArray> result(new CFX_ByteArray()); 69 std::unique_ptr<CFX_ByteArray> result(new CFX_ByteArray());
67 result->SetSize(m_version->GetTotalCodewords()); 70 result->SetSize(m_version->GetTotalCodewords());
68 int32_t resultOffset = 0; 71 int32_t resultOffset = 0;
69 int32_t row = 4; 72 int32_t row = 4;
70 int32_t column = 0; 73 int32_t column = 0;
71 int32_t numRows = m_mappingBitMatrix->GetHeight(); 74 int32_t numRows = m_mappingBitMatrix->GetHeight();
72 int32_t numColumns = m_mappingBitMatrix->GetWidth(); 75 int32_t numColumns = m_mappingBitMatrix->GetWidth();
73 FX_BOOL corner1Read = FALSE; 76 FX_BOOL corner1Read = FALSE;
74 FX_BOOL corner2Read = FALSE; 77 FX_BOOL corner2Read = FALSE;
75 FX_BOOL corner3Read = FALSE; 78 FX_BOOL corner3Read = FALSE;
76 FX_BOOL corner4Read = FALSE; 79 FX_BOOL corner4Read = FALSE;
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 if (bitMatrix->Get(readColumnOffset, readRowOffset)) { 369 if (bitMatrix->Get(readColumnOffset, readRowOffset)) {
367 int32_t writeColumnOffset = dataRegionColumnOffset + j; 370 int32_t writeColumnOffset = dataRegionColumnOffset + j;
368 bitMatrixWithoutAlignment->Set(writeColumnOffset, writeRowOffset); 371 bitMatrixWithoutAlignment->Set(writeColumnOffset, writeRowOffset);
369 } 372 }
370 } 373 }
371 } 374 }
372 } 375 }
373 } 376 }
374 return bitMatrixWithoutAlignment; 377 return bitMatrixWithoutAlignment;
375 } 378 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698