Index: 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 7c9d5a9688bec93bda75af893d87b198b3082b8d..7909054533a8a450e474a5e606fc12e3dfbf5dd3 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; |
} |