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

Side by Side Diff: xfa/src/fxbarcode/oned/BC_OneDimReader.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, 10 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 2008 ZXing authors 8 * Copyright 2008 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/oned/BC_OneDimReader.h"
24
25 #include <memory>
26
23 #include "xfa/src/fxbarcode/BC_Reader.h" 27 #include "xfa/src/fxbarcode/BC_Reader.h"
24 #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" 28 #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
25 #include "xfa/src/fxbarcode/oned/BC_OneDReader.h" 29 #include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
26 #include "xfa/src/fxbarcode/oned/BC_OneDimReader.h"
27 #include "xfa/src/fxbarcode/utils.h" 30 #include "xfa/src/fxbarcode/utils.h"
28 31
29 const int32_t CBC_OneDimReader::MAX_AVG_VARIANCE = (int32_t)(256 * 0.48f); 32 const int32_t CBC_OneDimReader::MAX_AVG_VARIANCE = (int32_t)(256 * 0.48f);
30 const int32_t CBC_OneDimReader::MAX_INDIVIDUAL_VARIANCE = (int32_t)(256 * 0.7f); 33 const int32_t CBC_OneDimReader::MAX_INDIVIDUAL_VARIANCE = (int32_t)(256 * 0.7f);
31 const int32_t CBC_OneDimReader::START_END_PATTERN[3] = {1, 1, 1}; 34 const int32_t CBC_OneDimReader::START_END_PATTERN[3] = {1, 1, 1};
32 const int32_t CBC_OneDimReader::MIDDLE_PATTERN[5] = {1, 1, 1, 1, 1}; 35 const int32_t CBC_OneDimReader::MIDDLE_PATTERN[5] = {1, 1, 1, 1, 1};
33 const int32_t CBC_OneDimReader::L_PATTERNS[10][4] = { 36 const int32_t CBC_OneDimReader::L_PATTERNS[10][4] = {
34 {3, 2, 1, 1}, {2, 2, 2, 1}, {2, 1, 2, 2}, {1, 4, 1, 1}, {1, 1, 3, 2}, 37 {3, 2, 1, 1}, {2, 2, 2, 1}, {2, 1, 2, 2}, {1, 4, 1, 1}, {1, 1, 3, 2},
35 {1, 2, 3, 1}, {1, 1, 1, 4}, {1, 3, 1, 2}, {1, 2, 1, 3}, {3, 1, 1, 2}}; 38 {1, 2, 3, 1}, {1, 1, 1, 4}, {1, 3, 1, 2}, {1, 2, 1, 3}, {3, 1, 1, 2}};
36 const int32_t CBC_OneDimReader::L_AND_G_PATTERNS[20][4] = { 39 const int32_t CBC_OneDimReader::L_AND_G_PATTERNS[20][4] = {
(...skipping 29 matching lines...) Expand all
66 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 69 BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
67 foundStart = booT; 70 foundStart = booT;
68 } 71 }
69 } 72 }
70 return startRange; 73 return startRange;
71 } 74 }
72 CFX_ByteString CBC_OneDimReader::DecodeRow(int32_t rowNumber, 75 CFX_ByteString CBC_OneDimReader::DecodeRow(int32_t rowNumber,
73 CBC_CommonBitArray* row, 76 CBC_CommonBitArray* row,
74 int32_t hints, 77 int32_t hints,
75 int32_t& e) { 78 int32_t& e) {
76 CFX_Int32Array* StartPattern = FindStartGuardPattern(row, e); 79 std::unique_ptr<CFX_Int32Array> result(FindStartGuardPattern(row, e));
77 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 80 BC_EXCEPTION_CHECK_ReturnValue(e, "");
78 CBC_AutoPtr<CFX_Int32Array> result(StartPattern);
79 CFX_ByteString temp = DecodeRow(rowNumber, row, result.get(), hints, e); 81 CFX_ByteString temp = DecodeRow(rowNumber, row, result.get(), hints, e);
80 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 82 BC_EXCEPTION_CHECK_ReturnValue(e, "");
81 return temp; 83 return temp;
82 } 84 }
83 CFX_ByteString CBC_OneDimReader::DecodeRow(int32_t rowNumber, 85 CFX_ByteString CBC_OneDimReader::DecodeRow(int32_t rowNumber,
84 CBC_CommonBitArray* row, 86 CBC_CommonBitArray* row,
85 CFX_Int32Array* startGuardRange, 87 CFX_Int32Array* startGuardRange,
86 int32_t hints, 88 int32_t hints,
87 int32_t& e) { 89 int32_t& e) {
88 CFX_ByteString result; 90 CFX_ByteString result;
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 } 212 }
211 } 213 }
212 if (bestMatch >= 0) { 214 if (bestMatch >= 0) {
213 return bestMatch; 215 return bestMatch;
214 } else { 216 } else {
215 e = BCExceptionNotFound; 217 e = BCExceptionNotFound;
216 return 0; 218 return 0;
217 } 219 }
218 return 0; 220 return 0;
219 } 221 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698