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

Side by Side Diff: xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.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_DataMatrixReader.h"
24
25 #include <memory>
26
23 #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" 27 #include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
24 #include "xfa/src/fxbarcode/BC_Reader.h" 28 #include "xfa/src/fxbarcode/BC_Reader.h"
25 #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" 29 #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
26 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h" 30 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h"
27 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h" 31 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h"
28 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h"
29 #include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" 32 #include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h"
30 #include "xfa/src/fxbarcode/utils.h" 33 #include "xfa/src/fxbarcode/utils.h"
31 34
32 CBC_DataMatrixReader::CBC_DataMatrixReader() { 35 CBC_DataMatrixReader::CBC_DataMatrixReader() {
33 m_decoder = NULL; 36 m_decoder = NULL;
34 } 37 }
35 void CBC_DataMatrixReader::Init() { 38 void CBC_DataMatrixReader::Init() {
36 m_decoder = new CBC_DataMatrixDecoder; 39 m_decoder = new CBC_DataMatrixDecoder;
37 m_decoder->Init(); 40 m_decoder->Init();
38 } 41 }
39 CBC_DataMatrixReader::~CBC_DataMatrixReader() { 42 CBC_DataMatrixReader::~CBC_DataMatrixReader() {
40 delete m_decoder; 43 delete m_decoder;
41 } 44 }
42 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image, 45 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image,
43 int32_t hints, 46 int32_t hints,
44 int32_t& e) { 47 int32_t& e) {
45 CBC_CommonBitMatrix* cdr = image->GetBlackMatrix(e); 48 CBC_CommonBitMatrix* cdr = image->GetBlackMatrix(e);
46 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 49 BC_EXCEPTION_CHECK_ReturnValue(e, "");
47 CBC_DataMatrixDetector detector(cdr); 50 CBC_DataMatrixDetector detector(cdr);
48 detector.Init(e); 51 detector.Init(e);
49 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 52 BC_EXCEPTION_CHECK_ReturnValue(e, "");
50 CBC_QRDetectorResult* ddr = detector.Detect(e); 53 std::unique_ptr<CBC_QRDetectorResult> detectorResult(detector.Detect(e));
51 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 54 BC_EXCEPTION_CHECK_ReturnValue(e, "");
52 CBC_AutoPtr<CBC_QRDetectorResult> detectorResult(ddr); 55 std::unique_ptr<CBC_CommonDecoderResult> decodeResult(
53 CBC_CommonDecoderResult* ResultTemp = 56 m_decoder->Decode(detectorResult->GetBits(), e));
54 m_decoder->Decode(detectorResult->GetBits(), e);
55 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 57 BC_EXCEPTION_CHECK_ReturnValue(e, "");
56 CBC_AutoPtr<CBC_CommonDecoderResult> decodeResult(ResultTemp);
57 return decodeResult->GetText(); 58 return decodeResult->GetText();
58 } 59 }
59 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image, 60 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image,
60 int32_t& e) { 61 int32_t& e) {
61 CFX_ByteString bs = Decode(image, 0, e); 62 CFX_ByteString bs = Decode(image, 0, e);
62 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 63 BC_EXCEPTION_CHECK_ReturnValue(e, "");
63 return bs; 64 return bs;
64 } 65 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698