diff options
author | Lei Zhang <thestig@chromium.org> | 2016-02-24 15:26:50 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2016-02-24 15:26:50 -0800 |
commit | 38eaaf36b09b816b963015e33dc4eb02580e0462 (patch) | |
tree | 9a2721eb404a2de4ddce91b50cac25b2cac0edb1 /xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp | |
parent | e1fb98394a6885cf03bdc6391e5a3878aad5b375 (diff) | |
download | pdfium-38eaaf36b09b816b963015e33dc4eb02580e0462.tar.xz |
Remove foo != NULL checks in xfa/src/fxbarcode.
R=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1726373002 .
Diffstat (limited to 'xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp')
-rw-r--r-- | xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp index f48faa3bb7..b9eee7c446 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp @@ -110,7 +110,7 @@ CFX_ByteString CBC_DetectionResult::toString() { } void CBC_DetectionResult::adjustIndicatorColumnRowNumbers( CBC_DetectionResultColumn* detectionResultColumn) { - if (detectionResultColumn != NULL) { + if (detectionResultColumn) { ((CBC_DetectionResultRowIndicatorColumn*)detectionResultColumn) ->adjustCompleteIndicatorColumnRowNumbers(*m_barcodeMetadata); } @@ -156,8 +156,8 @@ int32_t CBC_DetectionResult::adjustRowNumbersFromBothRI() { ->getCodewords(); for (int32_t codewordsRow = 0; codewordsRow < LRIcodewords->GetSize(); codewordsRow++) { - if (LRIcodewords->GetAt(codewordsRow) != NULL && - RRIcodewords->GetAt(codewordsRow) != NULL && + if (LRIcodewords->GetAt(codewordsRow) && + RRIcodewords->GetAt(codewordsRow) && ((CBC_Codeword*)LRIcodewords->GetAt(codewordsRow))->getRowNumber() == ((CBC_Codeword*)RRIcodewords->GetAt(codewordsRow)) ->getRowNumber()) { @@ -208,7 +208,7 @@ int32_t CBC_DetectionResult::adjustRowNumbersFromRRI() { m_detectionResultColumns.GetAt(barcodeColumn)) ->getCodewords() ->GetAt(codewordsRow); - if (codeword != NULL) { + if (codeword) { invalidRowCounts = adjustRowNumberIfValid(rowIndicatorRowNumber, invalidRowCounts, codeword); if (!codeword->hasValidRowNumber()) { @@ -243,7 +243,7 @@ int32_t CBC_DetectionResult::adjustRowNumbersFromLRI() { m_detectionResultColumns[barcodeColumn]) ->getCodewords() ->GetAt(codewordsRow); - if (codeword != NULL) { + if (codeword) { invalidRowCounts = adjustRowNumberIfValid(rowIndicatorRowNumber, invalidRowCounts, codeword); if (!codeword->hasValidRowNumber()) { @@ -280,7 +280,7 @@ void CBC_DetectionResult::adjustRowNumbers(int32_t barcodeColumn, barcodeColumn - 1)) ->getCodewords(); CFX_PtrArray* nextColumnCodewords = previousColumnCodewords; - if (m_detectionResultColumns[barcodeColumn + 1] != NULL) { + if (m_detectionResultColumns[barcodeColumn + 1]) { nextColumnCodewords = ((CBC_DetectionResultColumn*) m_detectionResultColumns[barcodeColumn + 1]) ->getCodewords(); |