Remove CJBig2_Object, CJBig2_Module, and friends.

core/src/fxcodec/jbig2/JBig2_Image.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <limits.h>
 
 #include "../../../include/fxcrt/fx_coordinates.h"
 #include "../../../include/fxcrt/fx_safe_types.h"
 #include "JBig2_Image.h"
 
 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_bNeedFree = FALSE;
     return;
   }
   m_nStride = ((w + 31) >> 5) << 2;
   if (m_nStride * m_nHeight > 0 && 104857600 / (int)m_nStride > m_nHeight) {
-    m_pData = (uint8_t*)m_pModule->JBig2_Malloc2(m_nStride, m_nHeight);
+    m_pData = FX_Alloc2D(uint8_t, m_nStride, m_nHeight);
   } else {
     m_pData = NULL;
   }
   m_bNeedFree = TRUE;
 }
 CJBig2_Image::CJBig2_Image(int32_t w,
                            int32_t h,
                            int32_t stride,
                            uint8_t* pBuf) {
   m_nWidth = w;
   m_nHeight = h;
   m_nStride = stride;
   m_pData = pBuf;
   m_bNeedFree = FALSE;
 }
 CJBig2_Image::CJBig2_Image(CJBig2_Image& im) {
-  m_pModule = im.m_pModule;
   m_nWidth = im.m_nWidth;
   m_nHeight = im.m_nHeight;
   m_nStride = im.m_nStride;
   if (im.m_pData) {
-    m_pData = (uint8_t*)m_pModule->JBig2_Malloc2(m_nStride, m_nHeight);
+    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_bNeedFree = TRUE;
 }
 CJBig2_Image::~CJBig2_Image() {
-  if (m_bNeedFree && m_pData) {
-    m_pModule->JBig2_Free(m_pData);
+  if (m_bNeedFree) {
+    FX_Free(m_pData);
   }
 }
 FX_BOOL CJBig2_Image::getPixel(int32_t x, int32_t y) {
   if (!m_pData) {
     return 0;
   }
   int32_t m, n;
   if (x < 0 || x >= m_nWidth) {
     return 0;
   }
@@ skipping 83 matching lines @@
     return FALSE;
   }
   return pSrc->composeTo(this, x, y, op, pSrcRect);
 }
 #define JBIG2_GETDWORD(buf) \
   ((FX_DWORD)(((buf)[0] << 24) | ((buf)[1] << 16) | ((buf)[2] << 8) | (buf)[3]))
 CJBig2_Image* CJBig2_Image::subImage(int32_t x,
                                      int32_t y,
                                      int32_t w,
                                      int32_t h) {
-  CJBig2_Image* pImage;
   int32_t m, n, j;
   uint8_t *pLineSrc, *pLineDst;
   FX_DWORD wTmp;
   uint8_t *pSrc, *pSrcEnd, *pDst, *pDstEnd;
   if (w == 0 || h == 0) {
     return NULL;
   }
-  JBIG2_ALLOC(pImage, CJBig2_Image(w, h));
+  CJBig2_Image* pImage = new CJBig2_Image(w, h);
   if (!m_pData) {
     pImage->fill(0);
     return pImage;
   }
   if (!pImage->m_pData) {
     return pImage;
   }
   pLineSrc = m_pData + m_nStride * y;
   pLineDst = pImage->m_pData;
   m = (x >> 5) << 2;
@@ skipping 40 matching lines @@
   }
   FX_DWORD dwH = pdfium::base::checked_cast<FX_DWORD>(h);
   FX_DWORD dwStride = pdfium::base::checked_cast<FX_DWORD>(m_nStride);
   FX_DWORD dwHeight = pdfium::base::checked_cast<FX_DWORD>(m_nHeight);
   FX_SAFE_DWORD safeMemSize = dwH;
   safeMemSize *= dwStride;
   if (!safeMemSize.IsValid()) {
     return;
   }
   // The guaranteed reallocated memory is to be < 4GB (unsigned int).
-  m_pData =
-      (uint8_t*)m_pModule->JBig2_Realloc(m_pData, safeMemSize.ValueOrDie());
+  m_pData = FX_Realloc(uint8_t, m_pData, safeMemSize.ValueOrDie());
+
   // The result of dwHeight * dwStride doesn't overflow after the
   // checking of safeMemSize.
   // The same as the result of (dwH - dwHeight) * dwStride) because
   // dwH - dwHeight is always less than dwH(h) which is checked in
   // the calculation of dwH * dwStride.
   JBIG2_memset(m_pData + dwHeight * dwStride, v ? 0xff : 0,
                (dwH - dwHeight) * dwStride);
   m_nHeight = h;
 }
 FX_BOOL CJBig2_Image::composeTo_opt2(CJBig2_Image* pDst,
@@ skipping 853 matching lines @@
           dp[2] = (uint8_t)(tmp >> 8);
           dp[3] = (uint8_t)tmp;
         }
         lineSrc += m_nStride;
         lineDst += pDst->m_nStride;
       }
     }
   }
   return 1;
 }