Remove CJBig2_Object, CJBig2_Module, and friends.

core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp

Index: core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
diff --git a/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp b/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
index 2287b91840c40d728a8f9fd7ff58d393a16e730a..3b15bad5f0790310b6b63128eb008ecb17511795 100644
--- a/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
@@ -5,6 +5,9 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "JBig2_SymbolDict.h"
+
+#include "../../../include/fxcrt/fx_memory.h"
+
 CJBig2_SymbolDict::CJBig2_SymbolDict() {
   SDNUMEXSYMS = 0;
   SDEXSYMS = NULL;
@@ -13,18 +16,17 @@ CJBig2_SymbolDict::CJBig2_SymbolDict() {
 }
 
 CJBig2_SymbolDict* CJBig2_SymbolDict::DeepCopy() {
-  CJBig2_SymbolDict* dst = NULL;
   CJBig2_SymbolDict* src = this;
   if (src->m_bContextRetained || src->m_gbContext || src->m_grContext) {
     return NULL;
   }
-  JBIG2_ALLOC(dst, CJBig2_SymbolDict());
+  CJBig2_SymbolDict* dst = new CJBig2_SymbolDict;
   dst->SDNUMEXSYMS = src->SDNUMEXSYMS;
-  dst->SDEXSYMS = (CJBig2_Image**)m_pModule->JBig2_Malloc2(
-      sizeof(CJBig2_Image*), src->SDNUMEXSYMS);
+  dst->SDEXSYMS = (CJBig2_Image**)FX_Alloc2D(uint8_t, sizeof(CJBig2_Image*),
+                                             src->SDNUMEXSYMS);
   for (FX_DWORD i = 0; i < src->SDNUMEXSYMS; i++) {
     if (src->SDEXSYMS[i]) {
-      JBIG2_ALLOC(dst->SDEXSYMS[i], CJBig2_Image(*(src->SDEXSYMS[i])));
+      dst->SDEXSYMS[i] = new CJBig2_Image(*(src->SDEXSYMS[i]));
     } else {
       dst->SDEXSYMS[i] = NULL;
     }
@@ -37,14 +39,10 @@ CJBig2_SymbolDict::~CJBig2_SymbolDict() {
     for (FX_DWORD i = 0; i < SDNUMEXSYMS; i++) {
       delete SDEXSYMS[i];
     }
-    m_pModule->JBig2_Free(SDEXSYMS);
+    FX_Free(SDEXSYMS);
   }
   if (m_bContextRetained) {
-    if (m_gbContext) {
-      m_pModule->JBig2_Free(m_gbContext);
-    }
-    if (m_grContext) {
-      m_pModule->JBig2_Free(m_grContext);
-    }
+    FX_Free(m_gbContext);
+    FX_Free(m_grContext);
   }
 }