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

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

Issue 1726373002: Remove foo != NULL checks in xfa/src/fxbarcode. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@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");
(...skipping 19 matching lines...) Expand all
30 #include "xfa/src/fxbarcode/utils.h" 30 #include "xfa/src/fxbarcode/utils.h"
31 31
32 CBC_DataMatrixReader::CBC_DataMatrixReader() { 32 CBC_DataMatrixReader::CBC_DataMatrixReader() {
33 m_decoder = NULL; 33 m_decoder = NULL;
34 } 34 }
35 void CBC_DataMatrixReader::Init() { 35 void CBC_DataMatrixReader::Init() {
36 m_decoder = new CBC_DataMatrixDecoder; 36 m_decoder = new CBC_DataMatrixDecoder;
37 m_decoder->Init(); 37 m_decoder->Init();
38 } 38 }
39 CBC_DataMatrixReader::~CBC_DataMatrixReader() { 39 CBC_DataMatrixReader::~CBC_DataMatrixReader() {
40 if (m_decoder != NULL) { 40 delete m_decoder;
41 delete m_decoder;
42 }
43 m_decoder = NULL;
44 } 41 }
45 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image, 42 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image,
46 int32_t hints, 43 int32_t hints,
47 int32_t& e) { 44 int32_t& e) {
48 CBC_CommonBitMatrix* cdr = image->GetBlackMatrix(e); 45 CBC_CommonBitMatrix* cdr = image->GetBlackMatrix(e);
49 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 46 BC_EXCEPTION_CHECK_ReturnValue(e, "");
50 CBC_DataMatrixDetector detector(cdr); 47 CBC_DataMatrixDetector detector(cdr);
51 detector.Init(e); 48 detector.Init(e);
52 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 49 BC_EXCEPTION_CHECK_ReturnValue(e, "");
53 CBC_QRDetectorResult* ddr = detector.Detect(e); 50 CBC_QRDetectorResult* ddr = detector.Detect(e);
54 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 51 BC_EXCEPTION_CHECK_ReturnValue(e, "");
55 CBC_AutoPtr<CBC_QRDetectorResult> detectorResult(ddr); 52 CBC_AutoPtr<CBC_QRDetectorResult> detectorResult(ddr);
56 CBC_CommonDecoderResult* ResultTemp = 53 CBC_CommonDecoderResult* ResultTemp =
57 m_decoder->Decode(detectorResult->GetBits(), e); 54 m_decoder->Decode(detectorResult->GetBits(), e);
58 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 55 BC_EXCEPTION_CHECK_ReturnValue(e, "");
59 CBC_AutoPtr<CBC_CommonDecoderResult> decodeResult(ResultTemp); 56 CBC_AutoPtr<CBC_CommonDecoderResult> decodeResult(ResultTemp);
60 return decodeResult->GetText(); 57 return decodeResult->GetText();
61 } 58 }
62 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image, 59 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image,
63 int32_t& e) { 60 int32_t& e) {
64 CFX_ByteString bs = Decode(image, 0, e); 61 CFX_ByteString bs = Decode(image, 0, e);
65 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 62 BC_EXCEPTION_CHECK_ReturnValue(e, "");
66 return bs; 63 return bs;
67 } 64 }
OLDNEW
« no previous file with comments | « xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp ('k') | xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698