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

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: 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 18 matching lines...) Expand all
29 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h" 29 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h"
30 #include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" 30 #include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h"
31 CBC_DataMatrixReader::CBC_DataMatrixReader() { 31 CBC_DataMatrixReader::CBC_DataMatrixReader() {
32 m_decoder = NULL; 32 m_decoder = NULL;
33 } 33 }
34 void CBC_DataMatrixReader::Init() { 34 void CBC_DataMatrixReader::Init() {
35 m_decoder = new CBC_DataMatrixDecoder; 35 m_decoder = new CBC_DataMatrixDecoder;
36 m_decoder->Init(); 36 m_decoder->Init();
37 } 37 }
38 CBC_DataMatrixReader::~CBC_DataMatrixReader() { 38 CBC_DataMatrixReader::~CBC_DataMatrixReader() {
39 if (m_decoder != NULL) { 39 delete m_decoder;
40 delete m_decoder;
41 }
42 m_decoder = NULL;
43 } 40 }
44 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image, 41 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image,
45 int32_t hints, 42 int32_t hints,
46 int32_t& e) { 43 int32_t& e) {
47 CBC_CommonBitMatrix* cdr = image->GetBlackMatrix(e); 44 CBC_CommonBitMatrix* cdr = image->GetBlackMatrix(e);
48 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 45 BC_EXCEPTION_CHECK_ReturnValue(e, "");
49 CBC_DataMatrixDetector detector(cdr); 46 CBC_DataMatrixDetector detector(cdr);
50 detector.Init(e); 47 detector.Init(e);
51 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 48 BC_EXCEPTION_CHECK_ReturnValue(e, "");
52 CBC_QRDetectorResult* ddr = detector.Detect(e); 49 CBC_QRDetectorResult* ddr = detector.Detect(e);
53 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 50 BC_EXCEPTION_CHECK_ReturnValue(e, "");
54 CBC_AutoPtr<CBC_QRDetectorResult> detectorResult(ddr); 51 CBC_AutoPtr<CBC_QRDetectorResult> detectorResult(ddr);
55 CBC_CommonDecoderResult* ResultTemp = 52 CBC_CommonDecoderResult* ResultTemp =
56 m_decoder->Decode(detectorResult->GetBits(), e); 53 m_decoder->Decode(detectorResult->GetBits(), e);
57 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 54 BC_EXCEPTION_CHECK_ReturnValue(e, "");
58 CBC_AutoPtr<CBC_CommonDecoderResult> decodeResult(ResultTemp); 55 CBC_AutoPtr<CBC_CommonDecoderResult> decodeResult(ResultTemp);
59 return decodeResult->GetText(); 56 return decodeResult->GetText();
60 } 57 }
61 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image, 58 CFX_ByteString CBC_DataMatrixReader::Decode(CBC_BinaryBitmap* image,
62 int32_t& e) { 59 int32_t& e) {
63 CFX_ByteString bs = Decode(image, 0, e); 60 CFX_ByteString bs = Decode(image, 0, e);
64 BC_EXCEPTION_CHECK_ReturnValue(e, ""); 61 BC_EXCEPTION_CHECK_ReturnValue(e, "");
65 return bs; 62 return bs;
66 } 63 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698