| Index: xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp
|
| diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp
|
| index 9b0effcd30d0a6e28a259b4c95fdef5cc837019a..b40876916d872963be6f3fc63adf8080c7ad2b7d 100644
|
| --- a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp
|
| +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp
|
| @@ -38,19 +38,7 @@ CBC_QRCoder::CBC_QRCoder() {
|
| m_matrix = NULL;
|
| }
|
| CBC_QRCoder::~CBC_QRCoder() {
|
| - if (m_matrix != NULL) {
|
| - delete m_matrix;
|
| - m_matrix = NULL;
|
| - }
|
| - m_mode = NULL;
|
| - m_ecLevel = NULL;
|
| - m_version = -1;
|
| - m_matrixWidth = -1;
|
| - m_maskPattern = -1;
|
| - m_numTotalBytes = -1;
|
| - m_numDataBytes = -1;
|
| - m_numECBytes = -1;
|
| - m_numRSBlocks = -1;
|
| + delete m_matrix;
|
| }
|
| CBC_QRCoderMode* CBC_QRCoder::GetMode() {
|
| return m_mode;
|
| @@ -91,11 +79,11 @@ int32_t CBC_QRCoder::At(int32_t x, int32_t y, int32_t& e) {
|
| return value;
|
| }
|
| FX_BOOL CBC_QRCoder::IsValid() {
|
| - return m_mode != NULL && m_ecLevel != NULL && m_version != -1 &&
|
| - m_matrixWidth != -1 && m_maskPattern != -1 && m_numTotalBytes != -1 &&
|
| - m_numDataBytes != -1 && m_numECBytes != -1 && m_numRSBlocks != -1 &&
|
| + return m_mode && m_ecLevel && m_version != -1 && m_matrixWidth != -1 &&
|
| + m_maskPattern != -1 && m_numTotalBytes != -1 && m_numDataBytes != -1 &&
|
| + m_numECBytes != -1 && m_numRSBlocks != -1 &&
|
| IsValidMaskPattern(m_maskPattern) &&
|
| - m_numTotalBytes == m_numDataBytes + m_numECBytes && m_matrix != NULL &&
|
| + m_numTotalBytes == m_numDataBytes + m_numECBytes && m_matrix &&
|
| m_matrixWidth == m_matrix->GetWidth() &&
|
| m_matrix->GetWidth() == m_matrix->GetHeight();
|
| }
|
|
|