Remove a bunch of dead JBIG2 code.

core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h

 // 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
 
 #ifndef _JBIG2_GENERAL_DECODER_H_
 #define _JBIG2_GENERAL_DECODER_H_
 
 #include "../../../include/fxcodec/fx_codec_def.h"
 #include "../../../include/fxcrt/fx_coordinates.h"
 #include "JBig2_ArithDecoder.h"
 #include "JBig2_ArithIntDecoder.h"
 #include "JBig2_Define.h"
 #include "JBig2_SymbolDict.h"
 
 class CJBig2_HuffmanTable;
 class CJBig2_Image;
 class CJBig2_PatternDict;
+
 typedef enum {

[Tom Sepez, 2015/08/18 20:23:20]

nit: enum JBig2Corner {

[Lei Zhang, 2015/08/20 21:35:48]

Done.

   JBIG2_CORNER_BOTTOMLEFT = 0,
   JBIG2_CORNER_TOPLEFT = 1,
   JBIG2_CORNER_BOTTOMRIGHT = 2,
   JBIG2_CORNER_TOPRIGHT = 3
 } JBig2Corner;
+
 class CJBig2_GRDProc : public CJBig2_Object {
  public:
   CJBig2_GRDProc() {
     m_loopIndex = 0;
     m_pLine = NULL;
     m_pPause = NULL;
     m_DecodeType = 0;
     LTP = 0;
     m_ReplaceRect.left = 0;
     m_ReplaceRect.bottom = 0;
     m_ReplaceRect.top = 0;
     m_ReplaceRect.right = 0;
   }
 
   CJBig2_Image* decode_Arith(CJBig2_ArithDecoder* pArithDecoder,
                              JBig2ArithCtx* gbContext);
 
-  CJBig2_Image* decode_Arith_V2(CJBig2_ArithDecoder* pArithDecoder,
-                                JBig2ArithCtx* gbContext);
-
-  CJBig2_Image* decode_Arith_V1(CJBig2_ArithDecoder* pArithDecoder,
-                                JBig2ArithCtx* gbContext);
-
-  CJBig2_Image* decode_MMR(CJBig2_BitStream* pStream);
   FXCODEC_STATUS Start_decode_Arith(CJBig2_Image** pImage,
                                     CJBig2_ArithDecoder* pArithDecoder,
                                     JBig2ArithCtx* gbContext,
                                     IFX_Pause* pPause = NULL);
-  FXCODEC_STATUS Start_decode_Arith_V2(CJBig2_Image** pImage,
-                                       CJBig2_ArithDecoder* pArithDecoder,
-                                       JBig2ArithCtx* gbContext,
-                                       IFX_Pause* pPause = NULL);
-  FXCODEC_STATUS Start_decode_Arith_V1(CJBig2_Image** pImage,
-                                       CJBig2_ArithDecoder* pArithDecoder,
-                                       JBig2ArithCtx* gbContext,
-                                       IFX_Pause* pPause = NULL);
   FXCODEC_STATUS Start_decode_MMR(CJBig2_Image** pImage,
                                   CJBig2_BitStream* pStream,
                                   IFX_Pause* pPause = NULL);
   FXCODEC_STATUS Continue_decode(IFX_Pause* pPause);
   FX_RECT GetReplaceRect() { return m_ReplaceRect; }
 
+  FX_BOOL MMR;
+  FX_DWORD GBW;
+  FX_DWORD GBH;
+  uint8_t GBTEMPLATE;
+  FX_BOOL TPGDON;
+  FX_BOOL USESKIP;
+  CJBig2_Image* SKIP;
+  char GBAT[8];
+
  private:
   FXCODEC_STATUS decode_Arith(IFX_Pause* pPause);
-  FXCODEC_STATUS decode_Arith_V2(IFX_Pause* pPause);
-  FXCODEC_STATUS decode_Arith_V1(IFX_Pause* pPause);
-  FXCODEC_STATUS decode_MMR();
   FXCODEC_STATUS decode_Arith_Template0_opt3(CJBig2_Image* pImage,
                                              CJBig2_ArithDecoder* pArithDecoder,
                                              JBig2ArithCtx* gbContext,
                                              IFX_Pause* pPause);
   FXCODEC_STATUS decode_Arith_Template0_unopt(
       CJBig2_Image* pImage,
       CJBig2_ArithDecoder* pArithDecoder,
       JBig2ArithCtx* gbContext,
       IFX_Pause* pPause);
   FXCODEC_STATUS decode_Arith_Template1_opt3(CJBig2_Image* pImage,
@@ skipping 16 matching lines @@
       IFX_Pause* pPause);
   FXCODEC_STATUS decode_Arith_Template3_opt3(CJBig2_Image* pImage,
                                              CJBig2_ArithDecoder* pArithDecoder,
                                              JBig2ArithCtx* gbContext,
                                              IFX_Pause* pPause);
   FXCODEC_STATUS decode_Arith_Template3_unopt(
       CJBig2_Image* pImage,
       CJBig2_ArithDecoder* pArithDecoder,
       JBig2ArithCtx* gbContext,
       IFX_Pause* pPause);
-  FX_DWORD m_loopIndex;
-  uint8_t* m_pLine;
-  IFX_Pause* m_pPause;
-  FXCODEC_STATUS m_ProssiveStatus;
-  CJBig2_Image** m_pImage;
-  CJBig2_ArithDecoder* m_pArithDecoder;
-  JBig2ArithCtx* m_gbContext;
-  FX_WORD m_DecodeType;
-  FX_BOOL LTP;
-  FX_RECT m_ReplaceRect;
-
- private:
   CJBig2_Image* decode_Arith_Template0_opt(CJBig2_ArithDecoder* pArithDecoder,
                                            JBig2ArithCtx* gbContext);
 
   CJBig2_Image* decode_Arith_Template0_opt2(CJBig2_ArithDecoder* pArithDecoder,
                                             JBig2ArithCtx* gbContext);
 
   CJBig2_Image* decode_Arith_Template0_opt3(CJBig2_ArithDecoder* pArithDecoder,
                                             JBig2ArithCtx* gbContext);
 
   CJBig2_Image* decode_Arith_Template0_unopt(CJBig2_ArithDecoder* pArithDecoder,
@@ skipping 28 matching lines @@
 
   CJBig2_Image* decode_Arith_Template3_opt2(CJBig2_ArithDecoder* pArithDecoder,
                                             JBig2ArithCtx* gbContext);
 
   CJBig2_Image* decode_Arith_Template3_opt3(CJBig2_ArithDecoder* pArithDecoder,
                                             JBig2ArithCtx* gbContext);
 
   CJBig2_Image* decode_Arith_Template3_unopt(CJBig2_ArithDecoder* pArithDecoder,
                                              JBig2ArithCtx* gbContext);
 
- public:
-  FX_BOOL MMR;
-  FX_DWORD GBW;
-  FX_DWORD GBH;
-  uint8_t GBTEMPLATE;
-  FX_BOOL TPGDON;
-  FX_BOOL USESKIP;
-  CJBig2_Image* SKIP;
-  signed char GBAT[8];
+  FX_DWORD m_loopIndex;
+  uint8_t* m_pLine;
+  IFX_Pause* m_pPause;
+  FXCODEC_STATUS m_ProssiveStatus;
+  CJBig2_Image** m_pImage;
+  CJBig2_ArithDecoder* m_pArithDecoder;
+  JBig2ArithCtx* m_gbContext;
+  FX_WORD m_DecodeType;
+  FX_BOOL LTP;
+  FX_RECT m_ReplaceRect;
 };
+
 class CJBig2_GRRDProc : public CJBig2_Object {
  public:
   CJBig2_Image* decode(CJBig2_ArithDecoder* pArithDecoder,
                        JBig2ArithCtx* grContext);
 
   CJBig2_Image* decode_Template0_unopt(CJBig2_ArithDecoder* pArithDecoder,
                                        JBig2ArithCtx* grContext);
 
   CJBig2_Image* decode_Template0_opt(CJBig2_ArithDecoder* pArithDecoder,
                                      JBig2ArithCtx* grContext);
 
   CJBig2_Image* decode_Template1_unopt(CJBig2_ArithDecoder* pArithDecoder,
                                        JBig2ArithCtx* grContext);
 
   CJBig2_Image* decode_Template1_opt(CJBig2_ArithDecoder* pArithDecoder,
                                      JBig2ArithCtx* grContext);
 
-  CJBig2_Image* decode_V1(CJBig2_ArithDecoder* pArithDecoder,
-                          JBig2ArithCtx* grContext);
-
- public:
   FX_DWORD GRW;
   FX_DWORD GRH;
   FX_BOOL GRTEMPLATE;
   CJBig2_Image* GRREFERENCE;
   int32_t GRREFERENCEDX;
   int32_t GRREFERENCEDY;
   FX_BOOL TPGRON;
   signed char GRAT[4];
 };
+
 typedef struct {
   CJBig2_ArithIntDecoder *IADT, *IAFS, *IADS, *IAIT, *IARI, *IARDW, *IARDH,
       *IARDX, *IARDY;
   CJBig2_ArithIaidDecoder* IAID;
 } JBig2IntDecoderState;
+
 class CJBig2_TRDProc : public CJBig2_Object {
  public:
   CJBig2_Image* decode_Huffman(CJBig2_BitStream* pStream,
                                JBig2ArithCtx* grContext);
 
   CJBig2_Image* decode_Arith(CJBig2_ArithDecoder* pArithDecoder,
                              JBig2ArithCtx* grContext,
                              JBig2IntDecoderState* pIDS = NULL);
 
  public:
@@ skipping 91 matching lines @@
 
  public:
   FX_BOOL GSMMR;
   FX_BOOL GSUSESKIP;
   uint8_t GSBPP;
   FX_DWORD GSW, GSH;
   uint8_t GSTEMPLATE;
   CJBig2_Image* GSKIP;
 };
 #endif