Merge to XFA: Make a bunch of JBig2 classes independent of CJBig2_Object.

core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.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 "JBig2_ArithIntDecoder.h"
+
+#include "../../../include/fxcrt/fx_memory.h"
+
 CJBig2_ArithIntDecoder::CJBig2_ArithIntDecoder() {
-  IAx = (JBig2ArithCtx*)m_pModule->JBig2_Malloc2(sizeof(JBig2ArithCtx), 512);
+  IAx = (JBig2ArithCtx*)FX_AllocOrDie(sizeof(JBig2ArithCtx), 512);
   JBIG2_memset(IAx, 0, sizeof(JBig2ArithCtx) * 512);
 }
 CJBig2_ArithIntDecoder::~CJBig2_ArithIntDecoder() {
-  m_pModule->JBig2_Free(IAx);
+  FX_Free(IAx);
 }
 int CJBig2_ArithIntDecoder::decode(CJBig2_ArithDecoder* pArithDecoder,
                                    int* nResult) {
   int PREV, V;
   int S, D;
   int nNeedBits, nTemp, i;
   PREV = 1;
   S = pArithDecoder->DECODE(IAx + PREV);
   PREV = (PREV << 1) | S;
   D = pArithDecoder->DECODE(IAx + PREV);
@@ skipping 48 matching lines @@
     V = -V;
   }
   *nResult = V;
   if (S == 1 && V == 0) {
     return JBIG2_OOB;
   }
   return 0;
 }
 CJBig2_ArithIaidDecoder::CJBig2_ArithIaidDecoder(unsigned char SBSYMCODELENA) {
   SBSYMCODELEN = SBSYMCODELENA;
-  IAID = (JBig2ArithCtx*)m_pModule->JBig2_Malloc2(sizeof(JBig2ArithCtx),
-                                                  (1 << SBSYMCODELEN));
+  IAID =
+      (JBig2ArithCtx*)FX_AllocOrDie(sizeof(JBig2ArithCtx), (1 << SBSYMCODELEN));
   JBIG2_memset(IAID, 0, sizeof(JBig2ArithCtx) * (int)(1 << SBSYMCODELEN));
 }
 CJBig2_ArithIaidDecoder::~CJBig2_ArithIaidDecoder() {
-  m_pModule->JBig2_Free(IAID);
+  FX_Free(IAID);
 }
 int CJBig2_ArithIaidDecoder::decode(CJBig2_ArithDecoder* pArithDecoder,
                                     int* nResult) {
   int PREV;
   int D;
   int i;
   PREV = 1;
   for (i = 0; i < SBSYMCODELEN; i++) {
     D = pArithDecoder->DECODE(IAID + PREV);
     PREV = (PREV << 1) | D;
   }
   PREV = PREV - (1 << SBSYMCODELEN);
   *nResult = PREV;
   return 0;
 }