Merge to XFA: Use stdint.h types throughout PDFium.

core/src/fxcodec/jbig2/JBig2_GeneralDecoder.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_GeneralDecoder.h"
 #include "JBig2_ArithDecoder.h"
 #include "JBig2_ArithIntDecoder.h"
 #include "JBig2_HuffmanDecoder.h"
@@ skipping 132 matching lines @@
         }
     }
     return GBREG;
 }
 CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template0_opt2(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext)
 {
     FX_BOOL LTP, SLTP, bVal;
     FX_DWORD CONTEXT;
     CJBig2_Image *GBREG;
     FX_DWORD line1, line2;
-    FX_BYTE *pLine, cVal;
-    FX_INTPTR nStride, nStride2;
-    FX_INT32 nBits, k;
+    uint8_t *pLine, cVal;
+    intptr_t nStride, nStride2;
+    int32_t nBits, k;
     LTP = 0;
     JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
     if (GBREG->m_pData == NULL) {
         delete GBREG;
         m_pModule->JBig2_Error("Generic region decoding procedure: Create Image Failed with width = %d, height = %d\n", GBW, GBH);
         return NULL;
     }
     pLine = GBREG->m_pData;
     nStride = GBREG->m_nStride;
     nStride2 = nStride << 1;
@@ skipping 44 matching lines @@
         pLine += nStride;
     }
     return GBREG;
 }
 CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template0_opt3(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext)
 {
     FX_BOOL LTP, SLTP, bVal;
     FX_DWORD CONTEXT;
     CJBig2_Image *GBREG;
     FX_DWORD line1, line2;
-    FX_BYTE *pLine, *pLine1, *pLine2, cVal;
-    FX_INT32 nStride, nStride2, k;
-    FX_INT32 nLineBytes, nBitsLeft, cc;
+    uint8_t *pLine, *pLine1, *pLine2, cVal;
+    int32_t nStride, nStride2, k;
+    int32_t nLineBytes, nBitsLeft, cc;
     LTP = 0;
     JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
     if (GBREG->m_pData == NULL) {
         delete GBREG;
         m_pModule->JBig2_Error("Generic region decoding procedure: Create Image Failed with width = %d, height = %d\n", GBW, GBH);
         return NULL;
     }
     pLine = GBREG->m_pData;
     nStride = GBREG->m_nStride;
     nStride2 = nStride << 1;
@@ skipping 161 matching lines @@
         }
     }
     return GBREG;
 }
 CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template1_opt2(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext)
 {
     FX_BOOL LTP, SLTP, bVal;
     FX_DWORD CONTEXT;
     CJBig2_Image *GBREG;
     FX_DWORD line1, line2;
-    FX_BYTE *pLine, cVal;
-    FX_INTPTR nStride, nStride2;
-    FX_INT32 nBits, k;
+    uint8_t *pLine, cVal;
+    intptr_t nStride, nStride2;
+    int32_t nBits, k;
     LTP = 0;
     JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
     if (GBREG->m_pData == NULL) {
         delete GBREG;
         m_pModule->JBig2_Error("Generic region decoding procedure: Create Image Failed with width = %d, height = %d\n", GBW, GBH);
         return NULL;
     }
     pLine = GBREG->m_pData;
     nStride = GBREG->m_nStride;
     nStride2 = nStride << 1;
@@ skipping 44 matching lines @@
         pLine += nStride;
     }
     return GBREG;
 }
 CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template1_opt3(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext)
 {
     FX_BOOL LTP, SLTP, bVal;
     FX_DWORD CONTEXT;
     CJBig2_Image *GBREG;
     FX_DWORD line1, line2;
-    FX_BYTE *pLine, *pLine1, *pLine2, cVal;
-    FX_INT32 nStride, nStride2, k;
-    FX_INT32 nLineBytes, nBitsLeft, cc;
+    uint8_t *pLine, *pLine1, *pLine2, cVal;
+    int32_t nStride, nStride2, k;
+    int32_t nLineBytes, nBitsLeft, cc;
     LTP = 0;
     JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
     if (GBREG->m_pData == NULL) {
         delete GBREG;
         m_pModule->JBig2_Error("Generic region decoding procedure: Create Image Failed with width = %d, height = %d\n", GBW, GBH);
         return NULL;
     }
     pLine = GBREG->m_pData;
     nStride = GBREG->m_nStride;
     nStride2 = nStride << 1;
@@ skipping 156 matching lines @@
         }
     }
     return GBREG;
 }
 CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template2_opt2(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext)
 {
     FX_BOOL LTP, SLTP, bVal;
     FX_DWORD CONTEXT;
     CJBig2_Image *GBREG;
     FX_DWORD line1, line2;
-    FX_BYTE *pLine, cVal;
-    FX_INTPTR nStride, nStride2;
-    FX_INT32 nBits, k;
+    uint8_t *pLine, cVal;
+    intptr_t nStride, nStride2;
+    int32_t nBits, k;
     LTP = 0;
     JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
     if (GBREG->m_pData == NULL) {
         delete GBREG;
         m_pModule->JBig2_Error("Generic region decoding procedure: Create Image Failed with width = %d, height = %d\n", GBW, GBH);
         return NULL;
     }
     pLine = GBREG->m_pData;
     nStride = GBREG->m_nStride;
     nStride2 = nStride << 1;
@@ skipping 44 matching lines @@
         pLine += nStride;
     }
     return GBREG;
 }
 CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template2_opt3(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext)
 {
     FX_BOOL LTP, SLTP, bVal;
     FX_DWORD CONTEXT;
     CJBig2_Image *GBREG;
     FX_DWORD line1, line2;
-    FX_BYTE *pLine, *pLine1, *pLine2, cVal;
-    FX_INT32 nStride, nStride2, k;
-    FX_INT32 nLineBytes, nBitsLeft, cc;
+    uint8_t *pLine, *pLine1, *pLine2, cVal;
+    int32_t nStride, nStride2, k;
+    int32_t nLineBytes, nBitsLeft, cc;
     LTP = 0;
     JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
     if (GBREG->m_pData == NULL) {
         delete GBREG;
         m_pModule->JBig2_Error("Generic region decoding procedure: Create Image Failed with width = %d, height = %d\n", GBW, GBH);
         return NULL;
     }
     pLine = GBREG->m_pData;
     nStride = GBREG->m_nStride;
     nStride2 = nStride << 1;
@@ skipping 150 matching lines @@
         }
     }
     return GBREG;
 }
 CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template3_opt2(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext)
 {
     FX_BOOL LTP, SLTP, bVal;
     FX_DWORD CONTEXT;
     CJBig2_Image *GBREG;
     FX_DWORD line1;
-    FX_BYTE *pLine, cVal;
-    FX_INTPTR nStride;
-    FX_INT32 nBits, k;
+    uint8_t *pLine, cVal;
+    intptr_t nStride;
+    int32_t nBits, k;
     LTP = 0;
     JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
     if (GBREG->m_pData == NULL) {
         delete GBREG;
         m_pModule->JBig2_Error("Generic region decoding procedure: Create Image Failed with width = %d, height = %d\n", GBW, GBH);
         return NULL;
     }
     pLine = GBREG->m_pData;
     nStride = GBREG->m_nStride;
     for(FX_DWORD h = 0; h < GBH; h++) {
@@ skipping 35 matching lines @@
         pLine += nStride;
     }
     return GBREG;
 }
 CJBig2_Image *CJBig2_GRDProc::decode_Arith_Template3_opt3(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext)
 {
     FX_BOOL LTP, SLTP, bVal;
     FX_DWORD CONTEXT;
     CJBig2_Image *GBREG;
     FX_DWORD line1;
-    FX_BYTE *pLine, *pLine1, cVal;
-    FX_INT32 nStride, k;
-    FX_INT32 nLineBytes, nBitsLeft, cc;
+    uint8_t *pLine, *pLine1, cVal;
+    int32_t nStride, k;
+    int32_t nLineBytes, nBitsLeft, cc;
     LTP = 0;
     JBIG2_ALLOC(GBREG, CJBig2_Image(GBW, GBH));
     if (GBREG->m_pData == NULL) {
         delete GBREG;
         m_pModule->JBig2_Error("Generic region decoding procedure: Create Image Failed with width = %d, height = %d\n", GBW, GBH);
         return NULL;
     }
     pLine = GBREG->m_pData;
     nStride = GBREG->m_nStride;
     nLineBytes = ((GBW + 7) >> 3) - 1;
@@ skipping 460 matching lines @@
         }
     }
     return GRREG;
 }
 CJBig2_Image *CJBig2_GRRDProc::decode_Template0_opt(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *grContext)
 {
     FX_BOOL LTP, SLTP, bVal;
     FX_DWORD CONTEXT;
     CJBig2_Image *GRREG;
     FX_DWORD line1, line1_r, line2_r, line3_r;
-    FX_BYTE *pLine, *pLineR, cVal;
-    FX_INTPTR nStride, nStrideR, nOffset;
-    FX_INT32 k, nBits;
-    FX_INT32 GRWR, GRHR;
-    FX_INT32 GRW, GRH;
-    GRW = (FX_INT32)CJBig2_GRRDProc::GRW;
-    GRH = (FX_INT32)CJBig2_GRRDProc::GRH;
+    uint8_t *pLine, *pLineR, cVal;
+    intptr_t nStride, nStrideR, nOffset;
+    int32_t k, nBits;
+    int32_t GRWR, GRHR;
+    int32_t GRW, GRH;
+    GRW = (int32_t)CJBig2_GRRDProc::GRW;
+    GRH = (int32_t)CJBig2_GRRDProc::GRH;
     LTP = 0;
     JBIG2_ALLOC(GRREG, CJBig2_Image(GRW, GRH));
     if (GRREG->m_pData == NULL) {
         delete GRREG;
         m_pModule->JBig2_Error("Generic refinement region decoding procedure: Create Image Failed with width = %d, height = %d\n", GRW, GRH);
         return NULL;
     }
     pLine = GRREG->m_pData;
     pLineR = GRREFERENCE->m_pData;
     nStride = GRREG->m_nStride;
     nStrideR = GRREFERENCE->m_nStride;
-    GRWR = (FX_INT32)GRREFERENCE->m_nWidth;
-    GRHR = (FX_INT32)GRREFERENCE->m_nHeight;
+    GRWR = (int32_t)GRREFERENCE->m_nWidth;
+    GRHR = (int32_t)GRREFERENCE->m_nHeight;
     if (GRREFERENCEDY < -GRHR + 1 || GRREFERENCEDY > GRHR - 1) {
         GRREFERENCEDY = 0;
     }
     nOffset = -GRREFERENCEDY * nStrideR;
-    for (FX_INT32 h = 0; h < GRH; h++) {
+    for (int32_t h = 0; h < GRH; h++) {
         if(TPGRON) {
             SLTP = pArithDecoder->DECODE(&grContext[0x0010]);
             LTP = LTP ^ SLTP;
         }
         line1 = (h > 0) ? pLine[-nStride] << 4 : 0;
-        FX_INT32 reference_h = h - GRREFERENCEDY;
+        int32_t reference_h = h - GRREFERENCEDY;
         FX_BOOL line1_r_ok = (reference_h > 0 && reference_h < GRHR + 1);
         FX_BOOL line2_r_ok = (reference_h > -1 && reference_h < GRHR);
         FX_BOOL line3_r_ok = (reference_h > -2 && reference_h < GRHR - 1);
         line1_r = line1_r_ok ? pLineR[nOffset - nStrideR] : 0;
         line2_r = line2_r_ok ? pLineR[nOffset] : 0;
         line3_r = line3_r_ok ? pLineR[nOffset + nStrideR] : 0;
         if(LTP == 0) {
             CONTEXT = (line1 & 0x1c00) | (line1_r & 0x01c0)
                       | ((line2_r >> 3) & 0x0038) | ((line3_r >> 6) & 0x0007);
-            for (FX_INT32 w = 0; w < GRW; w += 8) {
+            for (int32_t w = 0; w < GRW; w += 8) {
                 nBits = GRW - w > 8 ? 8 : GRW - w;
                 if (h > 0)
                     line1 = (line1 << 8) |
                             (w + 8 < GRW ? pLine[-nStride + (w >> 3) + 1] << 4 : 0);
                 if (h > GRHR + GRREFERENCEDY + 1) {
                     line1_r = 0;
                     line2_r  = 0;
                     line3_r = 0;
                 } else {
                     if(line1_r_ok)
@@ skipping 17 matching lines @@
                               ((line1 >> (7 - k)) & 0x0400) |
                               ((line1_r >> (7 - k)) & 0x0040) |
                               ((line2_r >> (10 - k)) & 0x0008) |
                               ((line3_r >> (13 - k)) & 0x0001);
                 }
                 pLine[w >> 3] = cVal;
             }
         } else {
             CONTEXT = (line1 & 0x1c00) | (line1_r & 0x01c0)
                       | ((line2_r >> 3) & 0x0038) | ((line3_r >> 6) & 0x0007);
-            for (FX_INT32 w = 0; w < GRW; w += 8) {
+            for (int32_t w = 0; w < GRW; w += 8) {
                 nBits = GRW - w > 8 ? 8 : GRW - w;
                 if (h > 0)
                     line1 = (line1 << 8) |
                             (w + 8 < GRW ? pLine[-nStride + (w >> 3) + 1] << 4 : 0);
                 if(line1_r_ok)
                     line1_r = (line1_r << 8) |
                               (w + 8 < GRWR ? pLineR[nOffset - nStrideR + (w >> 3) + 1] : 0);
                 if(line2_r_ok)
                     line2_r = (line2_r << 8) |
                               (w + 8 < GRWR ? pLineR[nOffset + (w >> 3) + 1] : 0);
@@ skipping 110 matching lines @@
         }
     }
     return GRREG;
 }
 CJBig2_Image *CJBig2_GRRDProc::decode_Template1_opt(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *grContext)
 {
     FX_BOOL LTP, SLTP, bVal;
     FX_DWORD CONTEXT;
     CJBig2_Image *GRREG;
     FX_DWORD line1, line1_r, line2_r, line3_r;
-    FX_BYTE *pLine, *pLineR, cVal;
-    FX_INTPTR nStride, nStrideR, nOffset;
-    FX_INT32 k, nBits;
-    FX_INT32 GRWR, GRHR;
-    FX_INT32 GRW, GRH;
-    GRW = (FX_INT32)CJBig2_GRRDProc::GRW;
-    GRH = (FX_INT32)CJBig2_GRRDProc::GRH;
+    uint8_t *pLine, *pLineR, cVal;
+    intptr_t nStride, nStrideR, nOffset;
+    int32_t k, nBits;
+    int32_t GRWR, GRHR;
+    int32_t GRW, GRH;
+    GRW = (int32_t)CJBig2_GRRDProc::GRW;
+    GRH = (int32_t)CJBig2_GRRDProc::GRH;
     LTP = 0;
     JBIG2_ALLOC(GRREG, CJBig2_Image(GRW, GRH));
     if (GRREG->m_pData == NULL) {
         delete GRREG;
         m_pModule->JBig2_Error("Generic refinement region decoding procedure: Create Image Failed with width = %d, height = %d\n", GRW, GRH);
         return NULL;
     }
     pLine = GRREG->m_pData;
     pLineR = GRREFERENCE->m_pData;
     nStride = GRREG->m_nStride;
     nStrideR = GRREFERENCE->m_nStride;
-    GRWR = (FX_INT32)GRREFERENCE->m_nWidth;
-    GRHR = (FX_INT32)GRREFERENCE->m_nHeight;
+    GRWR = (int32_t)GRREFERENCE->m_nWidth;
+    GRHR = (int32_t)GRREFERENCE->m_nHeight;
     if (GRREFERENCEDY < -GRHR + 1 || GRREFERENCEDY > GRHR - 1) {
         GRREFERENCEDY = 0;
     }
     nOffset = -GRREFERENCEDY * nStrideR;
-    for (FX_INT32 h = 0; h < GRH; h++) {
+    for (int32_t h = 0; h < GRH; h++) {
         if(TPGRON) {
             SLTP = pArithDecoder->DECODE(&grContext[0x0008]);
             LTP = LTP ^ SLTP;
         }
         line1 = (h > 0) ? pLine[-nStride] << 1 : 0;
-        FX_INT32 reference_h = h - GRREFERENCEDY;
+        int32_t reference_h = h - GRREFERENCEDY;
         FX_BOOL line1_r_ok = (reference_h > 0 && reference_h < GRHR + 1);
         FX_BOOL line2_r_ok = (reference_h > -1 && reference_h < GRHR);
         FX_BOOL line3_r_ok = (reference_h > -2 && reference_h < GRHR - 1);
         line1_r = line1_r_ok ? pLineR[nOffset - nStrideR] : 0;
         line2_r = line2_r_ok ? pLineR[nOffset] : 0;
         line3_r = line3_r_ok ? pLineR[nOffset + nStrideR] : 0;
         if(LTP == 0) {
             CONTEXT = (line1 & 0x0380) | ((line1_r >> 2) & 0x0020)
                       | ((line2_r >> 4) & 0x001c) | ((line3_r >> 6) & 0x0003);
-            for (FX_INT32 w = 0; w < GRW; w += 8) {
+            for (int32_t w = 0; w < GRW; w += 8) {
                 nBits = GRW - w > 8 ? 8 : GRW - w;
                 if (h > 0)
                     line1 = (line1 << 8) |
                             (w + 8 < GRW ? pLine[-nStride + (w >> 3) + 1] << 1 : 0);
                 if(line1_r_ok)
                     line1_r = (line1_r << 8) |
                               (w + 8 < GRWR ? pLineR[nOffset - nStrideR + (w >> 3) + 1] : 0);
                 if(line2_r_ok)
                     line2_r = (line2_r << 8) |
                               (w + 8 < GRWR ? pLineR[nOffset + (w >> 3) + 1] : 0);
@@ skipping 11 matching lines @@
                               ((line1 >> (7 - k)) & 0x0080) |
                               ((line1_r >> (9 - k)) & 0x0020) |
                               ((line2_r >> (11 - k)) & 0x0004) |
                               ((line3_r >> (13 - k)) & 0x0001);
                 }
                 pLine[w >> 3] = cVal;
             }
         } else {
             CONTEXT = (line1 & 0x0380) | ((line1_r >> 2) & 0x0020)
                       | ((line2_r >> 4) & 0x001c) | ((line3_r >> 6) & 0x0003);
-            for (FX_INT32 w = 0; w < GRW; w += 8) {
+            for (int32_t w = 0; w < GRW; w += 8) {
                 nBits = GRW - w > 8 ? 8 : GRW - w;
                 if (h > 0)
                     line1 = (line1 << 8) |
                             (w + 8 < GRW ? pLine[-nStride + (w >> 3) + 1] << 1 : 0);
                 if(line1_r_ok)
                     line1_r = (line1_r << 8) |
                               (w + 8 < GRWR ? pLineR[nOffset - nStrideR + (w >> 3) + 1] : 0);
                 if(line2_r_ok)
                     line2_r = (line2_r << 8) |
                               (w + 8 < GRWR ? pLineR[nOffset + (w >> 3) + 1] : 0);
@@ skipping 142 matching lines @@
                     bVal = pArithDecoder->DECODE(&grContext[CONTEXT]);
                     GRREG->setPixel(w, h, bVal);
                 }
             }
         }
     }
     return GRREG;
 }
 CJBig2_Image *CJBig2_TRDProc::decode_Huffman(CJBig2_BitStream *pStream, JBig2ArithCtx *grContext)
 {
-    FX_INT32 STRIPT, FIRSTS;
+    int32_t STRIPT, FIRSTS;
     FX_DWORD NINSTANCES;
-    FX_INT32 DT, DFS, CURS;
-    FX_BYTE CURT;
-    FX_INT32 SI, TI;
+    int32_t DT, DFS, CURS;
+    uint8_t CURT;
+    int32_t SI, TI;
     FX_DWORD IDI;
     CJBig2_Image *IBI;
     FX_DWORD WI, HI;
-    FX_INT32 IDS;
+    int32_t IDS;
     FX_BOOL RI;
-    FX_INT32 RDWI, RDHI, RDXI, RDYI;
+    int32_t RDWI, RDHI, RDXI, RDYI;
     CJBig2_Image *IBOI;
     FX_DWORD WOI, HOI;
     CJBig2_Image *SBREG;
     FX_BOOL bFirst;
     FX_DWORD nTmp;
-    FX_INT32 nVal, nBits;
+    int32_t nVal, nBits;
     CJBig2_HuffmanDecoder *pHuffmanDecoder;
     CJBig2_GRRDProc *pGRRD;
     CJBig2_ArithDecoder *pArithDecoder;
     JBIG2_ALLOC(pHuffmanDecoder, CJBig2_HuffmanDecoder(pStream));
     JBIG2_ALLOC(SBREG, CJBig2_Image(SBW, SBH));
     SBREG->fill(SBDEFPIXEL);
     if(pHuffmanDecoder->decodeAValue(SBHUFFDT, &STRIPT) != 0) {
         m_pModule->JBig2_Error("text region decoding procedure (huffman): too short.");
         goto failed;
     }
@@ skipping 183 matching lines @@
     delete pHuffmanDecoder;
     return SBREG;
 failed:
     delete pHuffmanDecoder;
     delete SBREG;
     return NULL;
 }
 CJBig2_Image *CJBig2_TRDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *grContext,
         JBig2IntDecoderState *pIDS)
 {
-    FX_INT32 STRIPT, FIRSTS;
+    int32_t STRIPT, FIRSTS;
     FX_DWORD NINSTANCES;
-    FX_INT32 DT, DFS, CURS;
-    FX_INT32 CURT;
-    FX_INT32 SI, TI;
+    int32_t DT, DFS, CURS;
+    int32_t CURT;
+    int32_t SI, TI;
     FX_DWORD IDI;
     CJBig2_Image *IBI;
     FX_DWORD WI, HI;
-    FX_INT32 IDS;
+    int32_t IDS;
     FX_BOOL RI;
-    FX_INT32 RDWI, RDHI, RDXI, RDYI;
+    int32_t RDWI, RDHI, RDXI, RDYI;
     CJBig2_Image *IBOI;
     FX_DWORD WOI, HOI;
     CJBig2_Image *SBREG;
     FX_BOOL bFirst;
-    FX_INT32 nRet, nVal;
-    FX_INT32 bRetained;
+    int32_t nRet, nVal;
+    int32_t bRetained;
     CJBig2_ArithIntDecoder *IADT, *IAFS, *IADS, *IAIT, *IARI, *IARDW, *IARDH, *IARDX, *IARDY;
     CJBig2_ArithIaidDecoder *IAID;
     CJBig2_GRRDProc *pGRRD;
     if(pIDS) {
         IADT = pIDS->IADT;
         IAFS = pIDS->IAFS;
         IADS = pIDS->IADS;
         IAIT = pIDS->IAIT;
         IARI = pIDS->IARI;
         IARDW = pIDS->IARDW;
@@ skipping 204 matching lines @@
         delete IAID;
     }
     delete SBREG;
     return NULL;
 }
 CJBig2_SymbolDict *CJBig2_SDDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecoder,
         JBig2ArithCtx *gbContext, JBig2ArithCtx *grContext)
 {
     CJBig2_Image **SDNEWSYMS;
     FX_DWORD HCHEIGHT, NSYMSDECODED;
-    FX_INT32 HCDH;
+    int32_t HCDH;
     FX_DWORD SYMWIDTH, TOTWIDTH;
-    FX_INT32 DW;
+    int32_t DW;
     CJBig2_Image *BS;
     FX_DWORD I, J, REFAGGNINST;
     FX_BOOL *EXFLAGS;
     FX_DWORD EXINDEX;
     FX_BOOL CUREXFLAG;
     FX_DWORD EXRUNLENGTH;
-    FX_INT32 nVal;
+    int32_t nVal;
     FX_DWORD nTmp;
     FX_DWORD SBNUMSYMS;
-    FX_BYTE SBSYMCODELEN;
+    uint8_t SBSYMCODELEN;
     FX_DWORD IDI;
-    FX_INT32 RDXI, RDYI;
+    int32_t RDXI, RDYI;
     CJBig2_Image **SBSYMS;
     CJBig2_HuffmanTable *SBHUFFFS, *SBHUFFDS, *SBHUFFDT, *SBHUFFRDW, *SBHUFFRDH, *SBHUFFRDX, *SBHUFFRDY,
                         *SBHUFFRSIZE;
     CJBig2_GRRDProc *pGRRD;
     CJBig2_GRDProc *pGRD;
     CJBig2_ArithIntDecoder *IADH, *IADW, *IAAI, *IARDX, *IARDY, *IAEX,
                            *IADT, *IAFS, *IADS, *IAIT, *IARI, *IARDW, *IARDH;
     CJBig2_ArithIaidDecoder *IAID;
     CJBig2_SymbolDict *pDict;
     JBIG2_ALLOC(IADH, CJBig2_ArithIntDecoder());
     JBIG2_ALLOC(IADW, CJBig2_ArithIntDecoder());
     JBIG2_ALLOC(IAAI, CJBig2_ArithIntDecoder());
     JBIG2_ALLOC(IARDX, CJBig2_ArithIntDecoder());
     JBIG2_ALLOC(IARDY, CJBig2_ArithIntDecoder());
     JBIG2_ALLOC(IAEX, CJBig2_ArithIntDecoder());
     JBIG2_ALLOC(IADT, CJBig2_ArithIntDecoder());
     JBIG2_ALLOC(IAFS, CJBig2_ArithIntDecoder());
     JBIG2_ALLOC(IADS, CJBig2_ArithIntDecoder());
     JBIG2_ALLOC(IAIT, CJBig2_ArithIntDecoder());
     JBIG2_ALLOC(IARI, CJBig2_ArithIntDecoder());
     JBIG2_ALLOC(IARDW, CJBig2_ArithIntDecoder());
     JBIG2_ALLOC(IARDH, CJBig2_ArithIntDecoder());
     nTmp = 0;
     while((FX_DWORD)(1 << nTmp) < (SDNUMINSYMS + SDNUMNEWSYMS)) {
         nTmp ++;
     }
-    JBIG2_ALLOC(IAID, CJBig2_ArithIaidDecoder((FX_BYTE)nTmp));
+    JBIG2_ALLOC(IAID, CJBig2_ArithIaidDecoder((uint8_t)nTmp));
     SDNEWSYMS = (CJBig2_Image**)m_pModule->JBig2_Malloc2(SDNUMNEWSYMS, sizeof(CJBig2_Image*));
     FXSYS_memset32(SDNEWSYMS, 0 , SDNUMNEWSYMS * sizeof(CJBig2_Image*));
     HCHEIGHT = 0;
     NSYMSDECODED = 0;
     while(NSYMSDECODED < SDNUMNEWSYMS) {
         BS = NULL;
         if(IADH->decode(pArithDecoder, &HCDH) == -1) {
             m_pModule->JBig2_Error("symbol dictionary decoding procedure (arith): too short.");
             goto failed;
         }
@@ skipping 63 matching lines @@
                     pDecoder->SBW = SYMWIDTH;
                     pDecoder->SBH = HCHEIGHT;
                     pDecoder->SBNUMINSTANCES = REFAGGNINST;
                     pDecoder->SBSTRIPS = 1;
                     pDecoder->SBNUMSYMS = SDNUMINSYMS + NSYMSDECODED;
                     SBNUMSYMS = pDecoder->SBNUMSYMS;
                     nTmp = 0;
                     while((FX_DWORD)(1 << nTmp) < SBNUMSYMS) {
                         nTmp ++;
                     }
-                    SBSYMCODELEN = (FX_BYTE)nTmp;
+                    SBSYMCODELEN = (uint8_t)nTmp;
                     pDecoder->SBSYMCODELEN = SBSYMCODELEN;
                     SBSYMS = (CJBig2_Image**)m_pModule->JBig2_Malloc2(SBNUMSYMS, sizeof(CJBig2_Image*));
                     JBIG2_memcpy(SBSYMS, SDINSYMS, SDNUMINSYMS * sizeof(CJBig2_Image*));
                     JBIG2_memcpy(SBSYMS + SDNUMINSYMS, SDNEWSYMS, NSYMSDECODED * sizeof(CJBig2_Image*));
                     pDecoder->SBSYMS = SBSYMS;
                     pDecoder->SBDEFPIXEL = 0;
                     pDecoder->SBCOMBOP = JBIG2_COMPOSE_OR;
                     pDecoder->TRANSPOSED = 0;
                     pDecoder->REFCORNER = JBIG2_CORNER_TOPLEFT;
                     pDecoder->SBDSOFFSET = 0;
@@ skipping 192 matching lines @@
     delete IARDW;
     delete IARDH;
     return NULL;
 }
 CJBig2_SymbolDict *CJBig2_SDDProc::decode_Huffman(CJBig2_BitStream *pStream,
         JBig2ArithCtx *gbContext, JBig2ArithCtx *grContext, IFX_Pause* pPause)
 {
     CJBig2_Image **SDNEWSYMS;
     FX_DWORD *SDNEWSYMWIDTHS;
     FX_DWORD HCHEIGHT, NSYMSDECODED;
-    FX_INT32 HCDH;
+    int32_t HCDH;
     FX_DWORD SYMWIDTH, TOTWIDTH, HCFIRSTSYM;
-    FX_INT32 DW;
+    int32_t DW;
     CJBig2_Image *BS, *BHC;
     FX_DWORD I, J, REFAGGNINST;
     FX_BOOL *EXFLAGS;
     FX_DWORD EXINDEX;
     FX_BOOL CUREXFLAG;
     FX_DWORD EXRUNLENGTH;
-    FX_INT32 nVal, nBits;
+    int32_t nVal, nBits;
     FX_DWORD nTmp;
     FX_DWORD SBNUMSYMS;
-    FX_BYTE SBSYMCODELEN;
+    uint8_t SBSYMCODELEN;
     JBig2HuffmanCode *SBSYMCODES;
     FX_DWORD IDI;
-    FX_INT32 RDXI, RDYI;
+    int32_t RDXI, RDYI;
     FX_DWORD BMSIZE;
     FX_DWORD stride;
     CJBig2_Image **SBSYMS;
     CJBig2_HuffmanTable *SBHUFFFS, *SBHUFFDS, *SBHUFFDT, *SBHUFFRDW, *SBHUFFRDH, *SBHUFFRDX, *SBHUFFRDY,
                         *SBHUFFRSIZE, *pTable;
     CJBig2_HuffmanDecoder *pHuffmanDecoder;
     CJBig2_GRRDProc *pGRRD;
     CJBig2_ArithDecoder *pArithDecoder;
     CJBig2_GRDProc *pGRD;
     CJBig2_SymbolDict *pDict;
@@ skipping 136 matching lines @@
                     delete SBHUFFRDX;
                     delete SBHUFFRDY;
                     delete SBHUFFRSIZE;
                     delete pDecoder;
                 } else if(REFAGGNINST == 1) {
                     SBNUMSYMS = SDNUMINSYMS + SDNUMNEWSYMS;
                     nTmp = 1;
                     while((FX_DWORD)(1 << nTmp) < SBNUMSYMS) {
                         nTmp ++;
                     }
-                    SBSYMCODELEN = (FX_BYTE)nTmp;
+                    SBSYMCODELEN = (uint8_t)nTmp;
                     SBSYMCODES = (JBig2HuffmanCode*)m_pModule->JBig2_Malloc2(SBNUMSYMS, sizeof(JBig2HuffmanCode));
                     for(I = 0; I < SBNUMSYMS; I++) {
                         SBSYMCODES[I].codelen = SBSYMCODELEN;
                         SBSYMCODES[I].code = I;
                     }
                     nVal = 0;
                     nBits = 0;
                     for(;;) {
                         if(pStream->read1Bit(&nTmp) != 0) {
                             m_pModule->JBig2_Free(SBSYMCODES);
@@ skipping 67 matching lines @@
                     delete pArithDecoder;
                 }
                 SDNEWSYMS[NSYMSDECODED] = BS;
             }
             if(SDREFAGG == 0) {
                 SDNEWSYMWIDTHS[NSYMSDECODED] = SYMWIDTH;
             }
             NSYMSDECODED = NSYMSDECODED + 1;
         }
         if(SDREFAGG == 0) {
-            if(pHuffmanDecoder->decodeAValue(SDHUFFBMSIZE, (FX_INT32*)&BMSIZE) != 0) {
+            if(pHuffmanDecoder->decodeAValue(SDHUFFBMSIZE, (int32_t*)&BMSIZE) != 0) {
                 m_pModule->JBig2_Error("symbol dictionary decoding procedure (huffman): too short.");
                 goto failed;
             }
             pStream->alignByte();
             if(BMSIZE == 0) {
                 stride = (TOTWIDTH + 7) >> 3;
                 if(pStream->getByteLeft() >= stride * HCHEIGHT) {
                     JBIG2_ALLOC(BHC, CJBig2_Image(TOTWIDTH, HCHEIGHT));
                     for(I = 0; I < HCHEIGHT; I ++) {
                         JBIG2_memcpy(BHC->m_pData + I * BHC->m_nStride, pStream->getPointer(), stride);
@@ skipping 90 matching lines @@
     if(SDREFAGG == 0) {
         m_pModule->JBig2_Free(SDNEWSYMWIDTHS);
     }
     delete pHuffmanDecoder;
     return NULL;
 }
 CJBig2_Image *CJBig2_HTRDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecoder,
         JBig2ArithCtx *gbContext, IFX_Pause* pPause)
 {
     FX_DWORD ng, mg;
-    FX_INT32 x, y;
+    int32_t x, y;
     CJBig2_Image *HSKIP;
     FX_DWORD HBPP;
     FX_DWORD *GI;
     CJBig2_Image *HTREG;
     CJBig2_GSIDProc *pGID;
     JBIG2_ALLOC(HTREG, CJBig2_Image(HBW, HBH));
     HTREG->fill(HDEFPIXEL);
     HSKIP = NULL;
     if(HENABLESKIP == 1) {
         JBIG2_ALLOC(HSKIP, CJBig2_Image(HGW, HGH));
         for(mg = 0; mg < HGH; mg++) {
             for(ng = 0; ng < HGW; ng++) {
                 x = (HGX + mg * HRY + ng * HRX) >> 8;
                 y = (HGY + mg * HRX - ng * HRY) >> 8;
-                if((x + HPW <= 0) | (x >= (FX_INT32)HBW)
-                        | (y + HPH <= 0) | (y >= (FX_INT32)HPH)) {
+                if((x + HPW <= 0) | (x >= (int32_t)HBW)
+                        | (y + HPH <= 0) | (y >= (int32_t)HPH)) {
                     HSKIP->setPixel(ng, mg, 1);
                 } else {
                     HSKIP->setPixel(ng, mg, 0);
                 }
             }
         }
     }
     HBPP = 1;
     while((FX_DWORD)(1 << HBPP) < HNUMPATS) {
         HBPP ++;
     }
     JBIG2_ALLOC(pGID, CJBig2_GSIDProc());
     pGID->GSMMR = HMMR;
     pGID->GSW = HGW;
     pGID->GSH = HGH;
-    pGID->GSBPP = (FX_BYTE)HBPP;
+    pGID->GSBPP = (uint8_t)HBPP;
     pGID->GSUSESKIP = HENABLESKIP;
     pGID->GSKIP = HSKIP;
     pGID->GSTEMPLATE = HTEMPLATE;
     GI = pGID->decode_Arith(pArithDecoder, gbContext, pPause);
     if(GI == NULL) {
         goto failed;
     }
     for(mg = 0; mg < HGH; mg++) {
         for(ng = 0; ng < HGW; ng++) {
             x = (HGX + mg * HRY + ng * HRX) >> 8;
@@ skipping 15 matching lines @@
     if(HSKIP) {
         delete HSKIP;
     }
     delete pGID;
     delete HTREG;
     return NULL;
 }
 CJBig2_Image *CJBig2_HTRDProc::decode_MMR(CJBig2_BitStream *pStream, IFX_Pause* pPause)
 {
     FX_DWORD ng, mg;
-    FX_INT32 x, y;
+    int32_t x, y;
     FX_DWORD HBPP;
     FX_DWORD *GI;
     CJBig2_Image *HTREG;
     CJBig2_GSIDProc *pGID;
     JBIG2_ALLOC(HTREG, CJBig2_Image(HBW, HBH));
     HTREG->fill(HDEFPIXEL);
     HBPP = 1;
     while((FX_DWORD)(1 << HBPP) < HNUMPATS) {
         HBPP ++;
     }
     JBIG2_ALLOC(pGID, CJBig2_GSIDProc());
     pGID->GSMMR = HMMR;
     pGID->GSW = HGW;
     pGID->GSH = HGH;
-    pGID->GSBPP = (FX_BYTE)HBPP;
+    pGID->GSBPP = (uint8_t)HBPP;
     pGID->GSUSESKIP = 0;
     GI = pGID->decode_MMR(pStream, pPause);
     if(GI == NULL) {
         goto failed;
     }
     for(mg = 0; mg < HGH; mg++) {
         for(ng = 0; ng < HGW; ng++) {
             x = (HGX + mg * HRY + ng * HRX) >> 8;
             y = (HGY + mg * HRX - ng * HRY) >> 8;
             FX_DWORD pat_index = GI[mg * HGW + ng];
@@ skipping 22 matching lines @@
     pDict->NUMPATS = GRAYMAX + 1;
     pDict->HDPATS = (CJBig2_Image**)m_pModule->JBig2_Malloc2(sizeof(CJBig2_Image*), pDict->NUMPATS);
     JBIG2_memset(pDict->HDPATS, 0, sizeof(CJBig2_Image*)*pDict->NUMPATS);
     JBIG2_ALLOC(pGRD, CJBig2_GRDProc());
     pGRD->MMR = HDMMR;
     pGRD->GBW = (GRAYMAX + 1) * HDPW;
     pGRD->GBH = HDPH;
     pGRD->GBTEMPLATE = HDTEMPLATE;
     pGRD->TPGDON = 0;
     pGRD->USESKIP = 0;
-    pGRD->GBAT[0] = -(FX_INT32)HDPW;
+    pGRD->GBAT[0] = -(int32_t)HDPW;
     pGRD->GBAT[1] = 0;
     if(pGRD->GBTEMPLATE == 0) {
         pGRD->GBAT[2] = -3;
         pGRD->GBAT[3] = -1;
         pGRD->GBAT[4] = 2;
         pGRD->GBAT[5] = -2;
         pGRD->GBAT[6] = -2;
         pGRD->GBAT[7] = -2;
     }
     FXCODEC_STATUS status = pGRD->Start_decode_Arith(&BHDC, pArithDecoder, gbContext);
@@ skipping 48 matching lines @@
     delete BHDC;
     return pDict;
 failed:
     delete pDict;
     return NULL;
 }
 FX_DWORD *CJBig2_GSIDProc::decode_Arith(CJBig2_ArithDecoder *pArithDecoder,
                                         JBig2ArithCtx *gbContext, IFX_Pause* pPause)
 {
     CJBig2_Image **GSPLANES;
-    FX_INT32 J, K;
+    int32_t J, K;
     FX_DWORD x, y;
     FX_DWORD *GSVALS;
     CJBig2_GRDProc *pGRD;
     GSPLANES = (CJBig2_Image **)m_pModule->JBig2_Malloc2(sizeof(CJBig2_Image*), GSBPP);
     if (!GSPLANES) {
         return NULL;
     }
     GSVALS = (FX_DWORD*)m_pModule->JBig2_Malloc3(sizeof(FX_DWORD), GSW, GSH);
     if (!GSVALS) {
         m_pModule->JBig2_Free(GSPLANES);
@@ skipping 60 matching lines @@
     return GSVALS;
 failed:
     m_pModule->JBig2_Free(GSPLANES);
     delete pGRD;
     m_pModule->JBig2_Free(GSVALS);
     return NULL;
 }
 FX_DWORD *CJBig2_GSIDProc::decode_MMR(CJBig2_BitStream *pStream, IFX_Pause* pPause)
 {
     CJBig2_Image **GSPLANES;
-    FX_INT32 J, K;
+    int32_t J, K;
     FX_DWORD x, y;
     FX_DWORD *GSVALS;
     CJBig2_GRDProc *pGRD;
     GSPLANES = (CJBig2_Image **)m_pModule->JBig2_Malloc2(sizeof(CJBig2_Image*), GSBPP);
     if (!GSPLANES) {
         return NULL;
     }
     GSVALS = (FX_DWORD*)m_pModule->JBig2_Malloc3(sizeof(FX_DWORD), GSW, GSH);
     if (!GSVALS) {
         if (GSPLANES) {
@@ skipping 469 matching lines @@
             return decode_MMR();
     }
     m_ProssiveStatus = FXCODEC_STATUS_ERROR;
     return m_ProssiveStatus;
 }
 FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template0_opt3(CJBig2_Image *pImage, CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext, IFX_Pause* pPause)
 {
     FX_BOOL SLTP, bVal;
     FX_DWORD CONTEXT;
     FX_DWORD line1, line2;
-    FX_BYTE *pLine1, *pLine2, cVal;
-    FX_INT32 nStride, nStride2, k;
-    FX_INT32 nLineBytes, nBitsLeft, cc;
+    uint8_t *pLine1, *pLine2, cVal;
+    int32_t nStride, nStride2, k;
+    int32_t nLineBytes, nBitsLeft, cc;
     if(m_pLine == NULL) {
         m_pLine = pImage->m_pData;
     }
     nStride = pImage->m_nStride;
     nStride2 = nStride << 1;
     nLineBytes = ((GBW + 7) >> 3) - 1;
     nBitsLeft = GBW - (nLineBytes << 3);
     FX_DWORD height = GBH & 0x7fffffff;
     for(; m_loopIndex < height; m_loopIndex++) {
         if(TPGDON) {
@@ skipping 118 matching lines @@
         }
     }
     m_ProssiveStatus = FXCODEC_STATUS_DECODE_FINISH;
     return FXCODEC_STATUS_DECODE_FINISH;
 }
 FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template1_opt3(CJBig2_Image *pImage, CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext, IFX_Pause* pPause)
 {
     FX_BOOL SLTP, bVal;
     FX_DWORD CONTEXT;
     FX_DWORD line1, line2;
-    FX_BYTE *pLine1, *pLine2, cVal;
-    FX_INT32 nStride, nStride2, k;
-    FX_INT32 nLineBytes, nBitsLeft, cc;
+    uint8_t *pLine1, *pLine2, cVal;
+    int32_t nStride, nStride2, k;
+    int32_t nLineBytes, nBitsLeft, cc;
     if (!m_pLine) {
         m_pLine = pImage->m_pData;
     }
     nStride = pImage->m_nStride;
     nStride2 = nStride << 1;
     nLineBytes = ((GBW + 7) >> 3) - 1;
     nBitsLeft = GBW - (nLineBytes << 3);
     for(; m_loopIndex < GBH; m_loopIndex++) {
         if(TPGDON) {
             SLTP = pArithDecoder->DECODE(&gbContext[0x0795]);
@@ skipping 115 matching lines @@
         }
     }
     m_ProssiveStatus = FXCODEC_STATUS_DECODE_FINISH;
     return FXCODEC_STATUS_DECODE_FINISH;
 }
 FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template2_opt3(CJBig2_Image *pImage, CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext, IFX_Pause* pPause)
 {
     FX_BOOL SLTP, bVal;
     FX_DWORD CONTEXT;
     FX_DWORD line1, line2;
-    FX_BYTE *pLine1, *pLine2, cVal;
-    FX_INT32 nStride, nStride2, k;
-    FX_INT32 nLineBytes, nBitsLeft, cc;
+    uint8_t *pLine1, *pLine2, cVal;
+    int32_t nStride, nStride2, k;
+    int32_t nLineBytes, nBitsLeft, cc;
     if(!m_pLine) {
         m_pLine = pImage->m_pData;
     }
     nStride = pImage->m_nStride;
     nStride2 = nStride << 1;
     nLineBytes = ((GBW + 7) >> 3) - 1;
     nBitsLeft = GBW - (nLineBytes << 3);
     for(; m_loopIndex < GBH; m_loopIndex++) {
         if(TPGDON) {
             SLTP = pArithDecoder->DECODE(&gbContext[0x00e5]);
@@ skipping 113 matching lines @@
         }
     }
     m_ProssiveStatus = FXCODEC_STATUS_DECODE_FINISH;
     return FXCODEC_STATUS_DECODE_FINISH;
 }
 FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template3_opt3(CJBig2_Image *pImage, CJBig2_ArithDecoder *pArithDecoder, JBig2ArithCtx *gbContext, IFX_Pause* pPause)
 {
     FX_BOOL SLTP, bVal;
     FX_DWORD CONTEXT;
     FX_DWORD line1;
-    FX_BYTE *pLine1, cVal;
-    FX_INT32 nStride, k;
-    FX_INT32 nLineBytes, nBitsLeft, cc;
+    uint8_t *pLine1, cVal;
+    int32_t nStride, k;
+    int32_t nLineBytes, nBitsLeft, cc;
     if (!m_pLine) {
         m_pLine = pImage->m_pData;
     }
     nStride = pImage->m_nStride;
     nLineBytes = ((GBW + 7) >> 3) - 1;
     nBitsLeft = GBW - (nLineBytes << 3);
     for(; m_loopIndex < GBH; m_loopIndex++) {
         if(TPGDON) {
             SLTP = pArithDecoder->DECODE(&gbContext[0x0195]);
             LTP = LTP ^ SLTP;
@@ skipping 89 matching lines @@
         }
         if(pPause && pPause->NeedToPauseNow()) {
             m_loopIndex++;
             m_ProssiveStatus = FXCODEC_STATUS_DECODE_TOBECONTINUE;
             return FXCODEC_STATUS_DECODE_TOBECONTINUE;
         }
     }
     m_ProssiveStatus = FXCODEC_STATUS_DECODE_FINISH;
     return FXCODEC_STATUS_DECODE_FINISH;
 }