| Index: xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp
|
| diff --git a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp
|
| index d3d68541c441e15c6af843dca6aa66e4f4c30bd4..5c92214fb5eb8b9cbae8c2f42776f81af76b3c92 100644
|
| --- a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp
|
| +++ b/xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp
|
| @@ -30,13 +30,15 @@
|
| #define SYMBOLS_COUNT 30
|
|
|
| CBC_SymbolInfo* CBC_SymbolInfo::m_PROD_SYMBOLS[30] = {
|
| - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
|
| - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
|
| - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
|
| + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
| + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
| + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
| + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr};
|
| CBC_SymbolInfo* CBC_SymbolInfo::m_symbols[30] = {
|
| - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
|
| - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
|
| - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
|
| + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
| + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
| + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
| + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr};
|
| void CBC_SymbolInfo::Initialize() {
|
| m_PROD_SYMBOLS[0] = new CBC_SymbolInfo(FALSE, 3, 5, 8, 8, 1);
|
| m_PROD_SYMBOLS[1] = new CBC_SymbolInfo(FALSE, 5, 7, 10, 10, 1);
|
| @@ -77,8 +79,8 @@ void CBC_SymbolInfo::Initialize() {
|
| void CBC_SymbolInfo::Finalize() {
|
| for (int32_t i = 0; i < SYMBOLS_COUNT; i++) {
|
| delete m_PROD_SYMBOLS[i];
|
| - m_PROD_SYMBOLS[i] = NULL;
|
| - m_symbols[i] = NULL;
|
| + m_PROD_SYMBOLS[i] = nullptr;
|
| + m_symbols[i] = nullptr;
|
| }
|
| }
|
| CBC_SymbolInfo::CBC_SymbolInfo(FX_BOOL rectangular,
|
| @@ -134,7 +136,7 @@ CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords,
|
| SymbolShapeHint shape,
|
| FX_BOOL fail,
|
| int32_t& e) {
|
| - return lookup(dataCodewords, shape, NULL, NULL, fail, e);
|
| + return lookup(dataCodewords, shape, nullptr, nullptr, fail, e);
|
| }
|
| CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords,
|
| SymbolShapeHint shape,
|
| @@ -152,12 +154,12 @@ CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords,
|
| }
|
| if (minSize && (symbol->getSymbolWidth(e) < minSize->getWidth() ||
|
| symbol->getSymbolHeight(e) < minSize->getHeight())) {
|
| - BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
|
| + BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
|
| continue;
|
| }
|
| if (maxSize && (symbol->getSymbolWidth(e) > maxSize->getWidth() ||
|
| symbol->getSymbolHeight(e) > maxSize->getHeight())) {
|
| - BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
|
| + BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
|
| continue;
|
| }
|
| if (dataCodewords <= symbol->m_dataCapacity) {
|
| @@ -166,9 +168,9 @@ CBC_SymbolInfo* CBC_SymbolInfo::lookup(int32_t dataCodewords,
|
| }
|
| if (fail) {
|
| e = BCExceptionIllegalDataCodewords;
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| int32_t CBC_SymbolInfo::getHorizontalDataRegions(int32_t& e) {
|
| switch (m_dataRegions) {
|
|
|