Index: xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp |
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp |
index 107ab39c51a1d2a290b205a033af6dc85ff91178..33fa5d7925cccfdd4a6e8c8c512f4b6a44b11017 100644 |
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp |
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp |
@@ -109,7 +109,7 @@ CFX_ByteString CBC_DetectionResult::toString() { |
} |
void CBC_DetectionResult::adjustIndicatorColumnRowNumbers( |
CBC_DetectionResultColumn* detectionResultColumn) { |
- if (detectionResultColumn != NULL) { |
+ if (detectionResultColumn) { |
((CBC_DetectionResultRowIndicatorColumn*)detectionResultColumn) |
->adjustCompleteIndicatorColumnRowNumbers(*m_barcodeMetadata); |
} |
@@ -155,8 +155,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()) { |
@@ -207,7 +207,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()) { |
@@ -242,7 +242,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()) { |
@@ -279,7 +279,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(); |