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

Side by Side Diff: xfa/fxbarcode/datamatrix/BC_DataMatrixReader.cpp

Issue 2048983002: Get rid of NULLs in xfa/fxbarcode/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: nits Created 4 years, 6 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");
(...skipping 15 matching lines...) Expand all
26 26
27 #include "xfa/fxbarcode/BC_BinaryBitmap.h" 27 #include "xfa/fxbarcode/BC_BinaryBitmap.h"
28 #include "xfa/fxbarcode/BC_Reader.h" 28 #include "xfa/fxbarcode/BC_Reader.h"
29 #include "xfa/fxbarcode/common/BC_CommonDecoderResult.h" 29 #include "xfa/fxbarcode/common/BC_CommonDecoderResult.h"
30 #include "xfa/fxbarcode/datamatrix/BC_DataMatrixDecoder.h" 30 #include "xfa/fxbarcode/datamatrix/BC_DataMatrixDecoder.h"
31 #include "xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h" 31 #include "xfa/fxbarcode/datamatrix/BC_DataMatrixDetector.h"
32 #include "xfa/fxbarcode/qrcode/BC_QRDetectorResult.h" 32 #include "xfa/fxbarcode/qrcode/BC_QRDetectorResult.h"
33 #include "xfa/fxbarcode/utils.h" 33 #include "xfa/fxbarcode/utils.h"
34 34
35 CBC_DataMatrixReader::CBC_DataMatrixReader() { 35 CBC_DataMatrixReader::CBC_DataMatrixReader() {
36 m_decoder = NULL; 36 m_decoder = nullptr;
37 } 37 }
38 void CBC_DataMatrixReader::Init() { 38 void CBC_DataMatrixReader::Init() {
39 m_decoder = new CBC_DataMatrixDecoder; 39 m_decoder = new CBC_DataMatrixDecoder;
40 m_decoder->Init(); 40 m_decoder->Init();
41 } 41 }
42 CBC_DataMatrixReader::~CBC_DataMatrixReader() { 42 CBC_DataMatrixReader::~CBC_DataMatrixReader() {
43 delete m_decoder; 43 delete m_decoder;
44 } 44 }
45 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image, 45 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image,
46 int32_t hints, 46 int32_t hints,
47 int32_t& e) { 47 int32_t& e) {
48 CBC_CommonBitMatrix* cdr = image->GetBlackMatrix(e); 48 CBC_CommonBitMatrix* cdr = image->GetBlackMatrix(e);
49 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 49 BC_EXCEPTION_CHECK_ReturnValue(e, "");
50 CBC_DataMatrixDetector detector(cdr); 50 CBC_DataMatrixDetector detector(cdr);
51 detector.Init(e); 51 detector.Init(e);
52 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 52 BC_EXCEPTION_CHECK_ReturnValue(e, "");
53 std::unique_ptr<CBC_QRDetectorResult> detectorResult(detector.Detect(e)); 53 std::unique_ptr<CBC_QRDetectorResult> detectorResult(detector.Detect(e));
54 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 54 BC_EXCEPTION_CHECK_ReturnValue(e, "");
55 std::unique_ptr<CBC_CommonDecoderResult> decodeResult( 55 std::unique_ptr<CBC_CommonDecoderResult> decodeResult(
56 m_decoder->Decode(detectorResult->GetBits(), e)); 56 m_decoder->Decode(detectorResult->GetBits(), e));
57 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 57 BC_EXCEPTION_CHECK_ReturnValue(e, "");
58 return decodeResult->GetText(); 58 return decodeResult->GetText();
59 } 59 }
60 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image, 60 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image,
61 int32_t& e) { 61 int32_t& e) {
62 CFX_ByteString bs = Decode(image, 0, e); 62 CFX_ByteString bs = Decode(image, 0, e);
63 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 63 BC_EXCEPTION_CHECK_ReturnValue(e, "");
64 return bs; 64 return bs;
65 } 65 }
OLDNEW
« no previous file with comments | « xfa/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp ('k') | xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698