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 396 matching lines @@
     CPDF_DIBSource*             DetachMask();
     CPDF_DIBSource*             m_pMask;
     FX_DWORD                    m_MatteColor;
     FX_LPVOID                   m_pJbig2Context;
     CPDF_StreamAcc*             m_pGlobalStream;
     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();
-    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_BOOL                             m_bLoadMask;
-    FX_BOOL                             m_bDefaultDecode, m_bImageMask, m_bColorKey;
-    DIB_COMP_DATA*              m_pCompData;
-    FX_LPBYTE                   m_pLineBuf;
-    FX_LPBYTE                   m_pMaskedLine;
-    CFX_DIBitmap*               m_pCachedBitmap;
-    ICodec_ScanlineDecoder*     m_pDecoder;
+    FX_BOOL LoadColorInfo(CPDF_Dictionary* pFormResources, CPDF_Dictionary* pPageResources);

[Tom Sepez, 2015/02/02 22:55:45]

nit: I'd be tempted not to re-indent this to allow for merges from FX.

[Lei Zhang, 2015/02/07 00:44:01]

Ok, I left it alone.

+    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 LoadPalette();
+    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;

[Tom Sepez, 2015/02/02 22:55:45]

nit: as long as you're mucking with this, how about one declaration per line.

[Lei Zhang, 2015/02/07 00:44:01]

Done.

+    FX_BOOL m_bLoadMask;
+    FX_BOOL m_bDefaultDecode, m_bImageMask, m_bColorKey;

[Tom Sepez, 2015/02/02 22:55:45]

nit: here too.

[Lei Zhang, 2015/02/07 00:44:00]

Done.

+    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;
 };