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

Side by Side Diff: xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.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 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_QRFinderPatternFinder.h"
24
25 #include <memory>
26
23 #include "core/include/fxcrt/fx_basic.h" 27 #include "core/include/fxcrt/fx_basic.h"
24 #include "xfa/src/fxbarcode/BC_ResultPoint.h" 28 #include "xfa/src/fxbarcode/BC_ResultPoint.h"
25 #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" 29 #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
26 #include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h" 30 #include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h"
27 #include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h" 31 #include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h"
28 #include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h"
29 #include "xfa/src/fxbarcode/utils.h" 32 #include "xfa/src/fxbarcode/utils.h"
30 33
31 const int32_t CBC_QRFinderPatternFinder::CENTER_QUORUM = 2; 34 const int32_t CBC_QRFinderPatternFinder::CENTER_QUORUM = 2;
32 const int32_t CBC_QRFinderPatternFinder::MIN_SKIP = 3; 35 const int32_t CBC_QRFinderPatternFinder::MIN_SKIP = 3;
33 const int32_t CBC_QRFinderPatternFinder::MAX_MODULES = 57; 36 const int32_t CBC_QRFinderPatternFinder::MAX_MODULES = 57;
34 const int32_t CBC_QRFinderPatternFinder::INTEGER_MATH_SHIFT = 8; 37 const int32_t CBC_QRFinderPatternFinder::INTEGER_MATH_SHIFT = 8;
35 38
36 CBC_QRFinderPatternFinder::CBC_QRFinderPatternFinder( 39 CBC_QRFinderPatternFinder::CBC_QRFinderPatternFinder(
37 CBC_CommonBitMatrix* image) { 40 CBC_CommonBitMatrix* image) {
38 m_image = image; 41 m_image = image;
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 if (FoundPatternCross(stateCount)) { 154 if (FoundPatternCross(stateCount)) {
152 FX_BOOL confirmed = HandlePossibleCenter(stateCount, i, maxJ); 155 FX_BOOL confirmed = HandlePossibleCenter(stateCount, i, maxJ);
153 if (confirmed) { 156 if (confirmed) {
154 iSkip = stateCount[0]; 157 iSkip = stateCount[0];
155 if (m_hasSkipped) { 158 if (m_hasSkipped) {
156 done = HaveMultiplyConfirmedCenters(); 159 done = HaveMultiplyConfirmedCenters();
157 } 160 }
158 } 161 }
159 } 162 }
160 } 163 }
161 CFX_PtrArray* ptr = SelectBestpatterns(e); 164 std::unique_ptr<CFX_PtrArray> patternInfo(SelectBestpatterns(e));
162 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 165 BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
163 CBC_AutoPtr<CFX_PtrArray> patternInfo(ptr);
164 OrderBestPatterns(patternInfo.get()); 166 OrderBestPatterns(patternInfo.get());
165 return new CBC_QRFinderPatternInfo(patternInfo.get()); 167 return new CBC_QRFinderPatternInfo(patternInfo.get());
166 } 168 }
167 void CBC_QRFinderPatternFinder::OrderBestPatterns(CFX_PtrArray* patterns) { 169 void CBC_QRFinderPatternFinder::OrderBestPatterns(CFX_PtrArray* patterns) {
168 FX_FLOAT abDistance = Distance((CBC_ResultPoint*)(*patterns)[0], 170 FX_FLOAT abDistance = Distance((CBC_ResultPoint*)(*patterns)[0],
169 (CBC_ResultPoint*)(*patterns)[1]); 171 (CBC_ResultPoint*)(*patterns)[1]);
170 FX_FLOAT bcDistance = Distance((CBC_ResultPoint*)(*patterns)[1], 172 FX_FLOAT bcDistance = Distance((CBC_ResultPoint*)(*patterns)[1],
171 (CBC_ResultPoint*)(*patterns)[2]); 173 (CBC_ResultPoint*)(*patterns)[2]);
172 FX_FLOAT acDistance = Distance((CBC_ResultPoint*)(*patterns)[0], 174 FX_FLOAT acDistance = Distance((CBC_ResultPoint*)(*patterns)[0],
173 (CBC_ResultPoint*)(*patterns)[2]); 175 (CBC_ResultPoint*)(*patterns)[2]);
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 if (m_possibleCenters.GetSize() > 3) { 468 if (m_possibleCenters.GetSize() > 3) {
467 BC_FX_PtrArray_Sort(m_possibleCenters, centerComparator); 469 BC_FX_PtrArray_Sort(m_possibleCenters, centerComparator);
468 } 470 }
469 CFX_PtrArray* vec = new CFX_PtrArray(); 471 CFX_PtrArray* vec = new CFX_PtrArray();
470 vec->SetSize(3); 472 vec->SetSize(3);
471 (*vec)[0] = ((CBC_QRFinderPattern*)m_possibleCenters[0])->Clone(); 473 (*vec)[0] = ((CBC_QRFinderPattern*)m_possibleCenters[0])->Clone();
472 (*vec)[1] = ((CBC_QRFinderPattern*)m_possibleCenters[1])->Clone(); 474 (*vec)[1] = ((CBC_QRFinderPattern*)m_possibleCenters[1])->Clone();
473 (*vec)[2] = ((CBC_QRFinderPattern*)m_possibleCenters[2])->Clone(); 475 (*vec)[2] = ((CBC_QRFinderPattern*)m_possibleCenters[2])->Clone();
474 return vec; 476 return vec;
475 } 477 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698