Chromium Code Reviews Chromium Code Reviews
Issue 890883006:
Cleanup parts of fpdf_render_loadimage.cpp. (Closed)
Base URL: https://pdfium.googlesource.com/pdfium.git@master| Index: core/src/fpdfapi/fpdf_render/render_int.h |
| diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h |
| index bd7d375837f9533cdc3496f6fbd132fe5f9b2310..10bce191c2e9d11bb0418b4a3d83c3c9294f8317 100644 |
| --- a/core/src/fpdfapi/fpdf_render/render_int.h |
| +++ b/core/src/fpdfapi/fpdf_render/render_int.h |
| @@ -414,29 +414,28 @@ public: |
| 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
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 abou
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 |
