Get rid of NULLs in core/

core/fxcodec/jbig2/JBig2_Image.cpp

Index: core/fxcodec/jbig2/JBig2_Image.cpp
diff --git a/core/fxcodec/jbig2/JBig2_Image.cpp b/core/fxcodec/jbig2/JBig2_Image.cpp
index 6a1c060b752153914501dcff42c67b48ff41400e..c7f9942b0f30f7a6c51258be12d85cc1f7d439e8 100644
--- a/core/fxcodec/jbig2/JBig2_Image.cpp
+++ b/core/fxcodec/jbig2/JBig2_Image.cpp
@@ -14,7 +14,7 @@ CJBig2_Image::CJBig2_Image(int32_t w, int32_t h) {
   m_nWidth = w;
   m_nHeight = h;
   if (m_nWidth <= 0 || m_nHeight <= 0 || m_nWidth > INT_MAX - 31) {
-    m_pData = NULL;
+    m_pData = nullptr;
     m_bNeedFree = FALSE;
     return;
   }
@@ -22,7 +22,7 @@ CJBig2_Image::CJBig2_Image(int32_t w, int32_t h) {
   if (m_nStride * m_nHeight > 0 && 104857600 / (int)m_nStride > m_nHeight) {
     m_pData = FX_Alloc2D(uint8_t, m_nStride, m_nHeight);
   } else {
-    m_pData = NULL;
+    m_pData = nullptr;
   }
   m_bNeedFree = TRUE;
 }
@@ -44,7 +44,7 @@ CJBig2_Image::CJBig2_Image(const CJBig2_Image& im) {
     m_pData = FX_Alloc2D(uint8_t, m_nStride, m_nHeight);
     JBIG2_memcpy(m_pData, im.m_pData, m_nStride * m_nHeight);
   } else {
-    m_pData = NULL;
+    m_pData = nullptr;
   }
   m_bNeedFree = TRUE;
 }
@@ -123,7 +123,7 @@ FX_BOOL CJBig2_Image::composeTo(CJBig2_Image* pDst,
   if (!m_pData) {
     return FALSE;
   }
-  if (NULL == pSrcRect || *pSrcRect == FX_RECT(0, 0, m_nWidth, m_nHeight)) {
+  if (nullptr == pSrcRect || *pSrcRect == FX_RECT(0, 0, m_nWidth, m_nHeight)) {

[Tom Sepez, 2016/06/02 20:09:49]

nit: !pSrcRect

[Lei Zhang, 2016/06/07 07:33:23]

Done.

     return composeTo_opt2(pDst, x, y, op);
   }
   return composeTo_opt2(pDst, x, y, op, pSrcRect);
@@ -159,7 +159,7 @@ CJBig2_Image* CJBig2_Image::subImage(int32_t x,
   uint32_t wTmp;
   uint8_t *pSrc, *pSrcEnd, *pDst, *pDstEnd;
   if (w == 0 || h == 0) {
-    return NULL;
+    return nullptr;
   }
   CJBig2_Image* pImage = new CJBig2_Image(w, h);
   if (!m_pData) {
@@ -243,7 +243,7 @@ FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image* pDst,
   uint32_t s1 = 0, d1 = 0, d2 = 0, shift = 0, shift1 = 0, shift2 = 0, tmp = 0,
            tmp1 = 0, tmp2 = 0, maskL = 0, maskR = 0, maskM = 0;
 
-  uint8_t *lineSrc = NULL, *lineDst = NULL, *sp = NULL, *dp = NULL;
+  uint8_t *lineSrc = nullptr, *lineDst = nullptr, *sp = nullptr, *dp = nullptr;

[Tom Sepez, 2016/06/02 20:09:49]

one per line

[Lei Zhang, 2016/06/07 07:33:23]

Done.

 
   if (!m_pData) {
     return FALSE;