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

Side by Side Diff: xfa/src/fxbarcode/qrcode/BC_QRCodeReader.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_QRCodeReader.h"
24
25 #include <memory>
26
23 #include "xfa/src/fxbarcode/BC_Binarizer.h" 27 #include "xfa/src/fxbarcode/BC_Binarizer.h"
24 #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" 28 #include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
25 #include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h" 29 #include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h"
26 #include "xfa/src/fxbarcode/BC_LuminanceSource.h" 30 #include "xfa/src/fxbarcode/BC_LuminanceSource.h"
27 #include "xfa/src/fxbarcode/BC_Reader.h" 31 #include "xfa/src/fxbarcode/BC_Reader.h"
28 #include "xfa/src/fxbarcode/BC_ResultPoint.h" 32 #include "xfa/src/fxbarcode/BC_ResultPoint.h"
29 #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" 33 #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
30 #include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h" 34 #include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
31 #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" 35 #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
32 #include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h"
33 #include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h"
34 #include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h"
35 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h" 36 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h"
36 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" 37 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
37 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" 38 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h"
38 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" 39 #include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
39 #include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h" 40 #include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h"
40 #include "xfa/src/fxbarcode/qrcode/BC_QRDetector.h" 41 #include "xfa/src/fxbarcode/qrcode/BC_QRDetector.h"
41 #include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" 42 #include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h"
42 43
43 CBC_QRCodeReader::CBC_QRCodeReader() : m_decoder(NULL) {} 44 CBC_QRCodeReader::CBC_QRCodeReader() : m_decoder(NULL) {}
44 void CBC_QRCodeReader::Init() { 45 void CBC_QRCodeReader::Init() {
45 m_decoder = new CBC_QRCoderDecoder; 46 m_decoder = new CBC_QRCoderDecoder;
46 m_decoder->Init(); 47 m_decoder->Init();
47 } 48 }
48 CBC_QRCodeReader::~CBC_QRCodeReader() { 49 CBC_QRCodeReader::~CBC_QRCodeReader() {
49 delete m_decoder; 50 delete m_decoder;
50 } 51 }
51 CFX_ByteString CBC_QRCodeReader::Decode(CBC_BinaryBitmap* image, 52 CFX_ByteString CBC_QRCodeReader::Decode(CBC_BinaryBitmap* image,
52 int32_t hints, 53 int32_t hints,
53 int32_t& e) { 54 int32_t& e) {
54 CBC_CommonBitMatrix* matrix = image->GetMatrix(e); 55 CBC_CommonBitMatrix* matrix = image->GetMatrix(e);
55 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 56 BC_EXCEPTION_CHECK_ReturnValue(e, "");
56 CBC_QRDetector detector(matrix); 57 CBC_QRDetector detector(matrix);
57 CBC_QRDetectorResult* qdr = detector.Detect(hints, e); 58 std::unique_ptr<CBC_QRDetectorResult> detectorResult(
59 detector.Detect(hints, e));
58 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 60 BC_EXCEPTION_CHECK_ReturnValue(e, "");
59 CBC_AutoPtr<CBC_QRDetectorResult> detectorResult(qdr); 61 std::unique_ptr<CBC_CommonDecoderResult> decodeResult(
60 CBC_CommonDecoderResult* qdr2 = 62 m_decoder->Decode(detectorResult->GetBits(), 0, e));
61 m_decoder->Decode(detectorResult->GetBits(), 0, e);
62 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 63 BC_EXCEPTION_CHECK_ReturnValue(e, "");
63 CBC_AutoPtr<CBC_CommonDecoderResult> decodeResult(qdr2);
64 return (decodeResult->GetText()); 64 return (decodeResult->GetText());
65 } 65 }
66 CFX_ByteString CBC_QRCodeReader::Decode(const CFX_WideString& filename, 66 CFX_ByteString CBC_QRCodeReader::Decode(const CFX_WideString& filename,
67 int32_t hints, 67 int32_t hints,
68 int32_t byteModeDecode, 68 int32_t byteModeDecode,
69 int32_t& e) { 69 int32_t& e) {
70 CBC_BufferedImageLuminanceSource source(filename); 70 CBC_BufferedImageLuminanceSource source(filename);
71 source.Init(e); 71 source.Init(e);
72 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 72 BC_EXCEPTION_CHECK_ReturnValue(e, "");
73 CBC_GlobalHistogramBinarizer binarizer(&source); 73 CBC_GlobalHistogramBinarizer binarizer(&source);
(...skipping 25 matching lines...) Expand all
99 } 99 }
100 if (CBC_ReedSolomonGF256::DataMatrixField) { 100 if (CBC_ReedSolomonGF256::DataMatrixField) {
101 delete CBC_ReedSolomonGF256::DataMatrixField; 101 delete CBC_ReedSolomonGF256::DataMatrixField;
102 CBC_ReedSolomonGF256::DataMatrixField = NULL; 102 CBC_ReedSolomonGF256::DataMatrixField = NULL;
103 } 103 }
104 CBC_QRCoderMode::Destroy(); 104 CBC_QRCoderMode::Destroy();
105 CBC_QRCoderErrorCorrectionLevel::Destroy(); 105 CBC_QRCoderErrorCorrectionLevel::Destroy();
106 CBC_QRDataMask::Destroy(); 106 CBC_QRDataMask::Destroy();
107 CBC_QRCoderVersion::Destroy(); 107 CBC_QRCoderVersion::Destroy();
108 } 108 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698