| Index: xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
|
| diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
|
| index 03cd5fba505bbf15fcca91c3e05944347385dc97..f056ece25891af07f03dda4224ec828aa6bdd15e 100644
|
| --- a/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
|
| +++ b/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
|
| @@ -55,29 +55,29 @@ uint8_t* CBC_DataMatrixWriter::Encode(const CFX_WideString& contents,
|
| int32_t& e) {
|
| if (outWidth < 0 || outHeight < 0) {
|
| e = BCExceptionHeightAndWidthMustBeAtLeast1;
|
| - BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
|
| + BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
|
| }
|
| CBC_SymbolShapeHint::SymbolShapeHint shape =
|
| CBC_SymbolShapeHint::FORCE_SQUARE;
|
| - CBC_Dimension* minSize = NULL;
|
| - CBC_Dimension* maxSize = NULL;
|
| + CBC_Dimension* minSize = nullptr;
|
| + CBC_Dimension* maxSize = nullptr;
|
| CFX_WideString ecLevel;
|
| CFX_WideString encoded = CBC_HighLevelEncoder::encodeHighLevel(
|
| contents, ecLevel, shape, minSize, maxSize, e);
|
| - BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
|
| + BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
|
| CBC_SymbolInfo* symbolInfo = CBC_SymbolInfo::lookup(
|
| encoded.GetLength(), shape, minSize, maxSize, TRUE, e);
|
| - BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
|
| + BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
|
| CFX_WideString codewords =
|
| CBC_ErrorCorrection::encodeECC200(encoded, symbolInfo, e);
|
| - BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
|
| + BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
|
| CBC_DefaultPlacement* placement =
|
| new CBC_DefaultPlacement(codewords, symbolInfo->getSymbolDataWidth(e),
|
| symbolInfo->getSymbolDataHeight(e));
|
| - BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
|
| + BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
|
| placement->place();
|
| CBC_CommonByteMatrix* bytematrix = encodeLowLevel(placement, symbolInfo, e);
|
| - BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
|
| + BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
|
| outWidth = bytematrix->GetWidth();
|
| outHeight = bytematrix->GetHeight();
|
| uint8_t* result = FX_Alloc2D(uint8_t, outWidth, outHeight);
|
| @@ -91,12 +91,12 @@ CBC_CommonByteMatrix* CBC_DataMatrixWriter::encodeLowLevel(
|
| CBC_SymbolInfo* symbolInfo,
|
| int32_t& e) {
|
| int32_t symbolWidth = symbolInfo->getSymbolDataWidth(e);
|
| - BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
|
| + BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
|
| int32_t symbolHeight = symbolInfo->getSymbolDataHeight(e);
|
| - BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
|
| + BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
|
| CBC_CommonByteMatrix* matrix = new CBC_CommonByteMatrix(
|
| symbolInfo->getSymbolWidth(e), symbolInfo->getSymbolHeight(e));
|
| - BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
|
| + BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
|
| matrix->Init();
|
| int32_t matrixY = 0;
|
| for (int32_t y = 0; y < symbolHeight; y++) {
|
|
|