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

Side by Side Diff: xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.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, 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");
(...skipping 19 matching lines...) Expand all
30 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" 30 #include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h"
31 31
32 CBC_DataMatrixDecoder::CBC_DataMatrixDecoder() { 32 CBC_DataMatrixDecoder::CBC_DataMatrixDecoder() {
33 m_rsDecoder = NULL; 33 m_rsDecoder = NULL;
34 } 34 }
35 void CBC_DataMatrixDecoder::Init() { 35 void CBC_DataMatrixDecoder::Init() {
36 m_rsDecoder = 36 m_rsDecoder =
37 new CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256::DataMatrixField); 37 new CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256::DataMatrixField);
38 } 38 }
39 CBC_DataMatrixDecoder::~CBC_DataMatrixDecoder() { 39 CBC_DataMatrixDecoder::~CBC_DataMatrixDecoder() {
40 if (m_rsDecoder != NULL) { 40 delete m_rsDecoder;
41 delete m_rsDecoder;
42 }
43 m_rsDecoder = NULL;
44 } 41 }
45 CBC_CommonDecoderResult* CBC_DataMatrixDecoder::Decode( 42 CBC_CommonDecoderResult* CBC_DataMatrixDecoder::Decode(
46 CBC_CommonBitMatrix* bits, 43 CBC_CommonBitMatrix* bits,
47 int32_t& e) { 44 int32_t& e) {
48 CBC_DataMatrixBitMatrixParser parser; 45 CBC_DataMatrixBitMatrixParser parser;
49 parser.Init(bits, e); 46 parser.Init(bits, e);
50 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 47 BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
51 CBC_DataMatrixVersion* version = parser.GetVersion(); 48 CBC_DataMatrixVersion* version = parser.GetVersion();
52 CFX_ByteArray* byteTemp = parser.ReadCodewords(e); 49 CFX_ByteArray* byteTemp = parser.ReadCodewords(e);
53 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 50 BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 int32_t numECCodewords = codewordBytes.GetSize() - numDataCodewords; 103 int32_t numECCodewords = codewordBytes.GetSize() - numDataCodewords;
107 m_rsDecoder->Decode(&codewordsInts, numECCodewords, e); 104 m_rsDecoder->Decode(&codewordsInts, numECCodewords, e);
108 if (e != BCExceptionNO) { 105 if (e != BCExceptionNO) {
109 e = BCExceptionChecksumException; 106 e = BCExceptionChecksumException;
110 return; 107 return;
111 } 108 }
112 for (i = 0; i < numDataCodewords; i++) { 109 for (i = 0; i < numDataCodewords; i++) {
113 codewordBytes[i] = (uint8_t)codewordsInts[i]; 110 codewordBytes[i] = (uint8_t)codewordsInts[i];
114 } 111 }
115 } 112 }
OLDNEW
« no previous file with comments | « xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp ('k') | xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698