Merge to XFA: Cleanup parts of fpdf_render_loadimage.cpp.

core/src/fpdfapi/fpdf_render/render_int.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 _FPDF_PAGEOBJ_H_
 #include "../../../include/fpdfapi/fpdf_pageobj.h"
 #endif
 class CPDF_QuickStretcher;
@@ skipping 401 matching lines @@
     FX_BOOL                             m_bStdCS;
     int                                 m_Status;
     CPDF_Object*                m_pMaskStream;
     FX_BOOL                             m_bHasMask;
 protected:
     FX_BOOL                             LoadColorInfo(CPDF_Dictionary* pFormResources, CPDF_Dictionary* pPageResources);
     DIB_COMP_DATA*      GetDecodeAndMaskArray(FX_BOOL& bDefaultDecode, FX_BOOL& bColorKey);
     CPDF_DIBSource*             LoadMask(FX_DWORD& MatteColor);
     CPDF_DIBSource*             LoadMaskDIB(CPDF_Stream* pMask);
     void                                LoadJpxBitmap();
-    void                                LoadJbig2Bitmap();
     void                                LoadPalette();
-    FX_BOOL                             CreateDecoder();
+    int                                 CreateDecoder();
     void                                TranslateScanline24bpp(FX_LPBYTE dest_scan, FX_LPCBYTE src_scan) const;
     void                ValidateDictParam();
     CPDF_Document*              m_pDocument;
     const CPDF_Stream*  m_pStream;
     CPDF_StreamAcc*             m_pStreamAcc;
     const CPDF_Dictionary*      m_pDict;
     CPDF_ColorSpace*    m_pColorSpace;
-    FX_DWORD                    m_Family, m_bpc, m_bpc_orig, m_nComponents, m_GroupFamily;
+    FX_DWORD                    m_Family;
+    FX_DWORD                    m_bpc;
+    FX_DWORD                    m_bpc_orig;
+    FX_DWORD                    m_nComponents;
+    FX_DWORD                    m_GroupFamily;
     FX_BOOL                             m_bLoadMask;
-    FX_BOOL                             m_bDefaultDecode, m_bImageMask, m_bColorKey;
+    FX_BOOL                             m_bDefaultDecode;
+    FX_BOOL                             m_bImageMask;
+    FX_BOOL                             m_bColorKey;
     DIB_COMP_DATA*              m_pCompData;
     FX_LPBYTE                   m_pLineBuf;
     FX_LPBYTE                   m_pMaskedLine;
     CFX_DIBitmap*               m_pCachedBitmap;
     ICodec_ScanlineDecoder*     m_pDecoder;
 };
 #define FPDF_HUGE_IMAGE_SIZE    60000000
 class CPDF_DIBTransferFunc : public CFX_FilteredDIB
 {
 public:
     CPDF_DIBTransferFunc(const CPDF_TransferFunc* pTransferFunc);
     virtual FXDIB_Format        GetDestFormat();
     virtual FX_ARGB*            GetDestPalette()
     {
         return NULL;
     }
     virtual void                        TranslateScanline(FX_LPBYTE dest_buf, FX_LPCBYTE src_buf) const;
     virtual void                        TranslateDownSamples(FX_LPBYTE dest_buf, FX_LPCBYTE src_buf, int pixels, int Bpp) const;
     FX_LPCBYTE                          m_RampR;
     FX_LPCBYTE                          m_RampG;
     FX_LPCBYTE                          m_RampB;
 };
 struct _CPDF_UniqueKeyGen {
     void                Generate(int count, ...);
     FX_CHAR             m_Key[128];
     int                 m_KeyLen;
 };