diff options
| author | thestig <thestig@chromium.org> | 2016-06-09 18:39:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-09 18:39:33 -0700 |
| commit | 6dc1d7753691c0ff2f390e8ffd95a3182064487e (patch) | |
| tree | 43d77664973a76c107832ae7b3c3e0f04bba1fe0 /xfa/fxbarcode/datamatrix/BC_EncoderContext.cpp | |
| parent | fcf61b39ee597c73e80ba789833fb7fe49878422 (diff) | |
| download | pdfium-6dc1d7753691c0ff2f390e8ffd95a3182064487e.tar.xz | |
Get rid of NULLs in xfa/fxbarcode/
Review-Url: https://codereview.chromium.org/2048983002
Diffstat (limited to 'xfa/fxbarcode/datamatrix/BC_EncoderContext.cpp')
| -rw-r--r-- | xfa/fxbarcode/datamatrix/BC_EncoderContext.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fxbarcode/datamatrix/BC_EncoderContext.cpp b/xfa/fxbarcode/datamatrix/BC_EncoderContext.cpp index c99dcb7d7a..6e395837d4 100644 --- a/xfa/fxbarcode/datamatrix/BC_EncoderContext.cpp +++ b/xfa/fxbarcode/datamatrix/BC_EncoderContext.cpp @@ -46,10 +46,10 @@ CBC_EncoderContext::CBC_EncoderContext(const CFX_WideString msg, m_shape = FORCE_NONE; m_newEncoding = -1; m_pos = 0; - m_symbolInfo = NULL; + m_symbolInfo = nullptr; m_skipAtEnd = 0; - m_maxSize = NULL; - m_minSize = NULL; + m_maxSize = nullptr; + m_minSize = nullptr; } CBC_EncoderContext::~CBC_EncoderContext() {} void CBC_EncoderContext::setSymbolShape(SymbolShapeHint shape) { @@ -97,7 +97,7 @@ void CBC_EncoderContext::updateSymbolInfo(int32_t& e) { updateSymbolInfo(getCodewordCount(), e); } void CBC_EncoderContext::updateSymbolInfo(int32_t len, int32_t& e) { - if (m_symbolInfo == NULL || len > m_symbolInfo->m_dataCapacity) { + if (!m_symbolInfo || len > m_symbolInfo->m_dataCapacity) { m_symbolInfo = CBC_SymbolInfo::lookup(len, m_shape, m_minSize, m_maxSize, true, e); BC_EXCEPTION_CHECK_ReturnVoid(e); |