From 38eaaf36b09b816b963015e33dc4eb02580e0462 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 24 Feb 2016 15:26:50 -0800 Subject: Remove foo != NULL checks in xfa/src/fxbarcode. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1726373002 . --- xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp') diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp index 7c9d5a9688..7909054533 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp @@ -150,15 +150,13 @@ CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords, if (shape == FORCE_RECTANGLE && !symbol->m_rectangular) { continue; } - if (minSize != NULL && - (symbol->getSymbolWidth(e) < minSize->getWidth() || - symbol->getSymbolHeight(e) < minSize->getHeight())) { + if (minSize && (symbol->getSymbolWidth(e) < minSize->getWidth() || + symbol->getSymbolHeight(e) < minSize->getHeight())) { BC_EXCEPTION_CHECK_ReturnValue(e, NULL); continue; } - if (maxSize != NULL && - (symbol->getSymbolWidth(e) > maxSize->getWidth() || - symbol->getSymbolHeight(e) > maxSize->getHeight())) { + if (maxSize && (symbol->getSymbolWidth(e) > maxSize->getWidth() || + symbol->getSymbolHeight(e) > maxSize->getHeight())) { BC_EXCEPTION_CHECK_ReturnValue(e, NULL); continue; } -- cgit v1.2.3