diff options
author | Lei Zhang <thestig@chromium.org> | 2015-02-27 19:52:52 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-02-27 19:52:52 -0800 |
commit | 654403aedf0aac9a26ff6fd1f1cca8532528e9b0 (patch) | |
tree | 7fad93f9d172f69e2350ed009ebe0893f1f6fb6d /core/src/fpdfapi/fpdf_render/render_int.h | |
parent | 266dc920714f119562ef2bbf2f3af474539c36d7 (diff) | |
download | pdfium-654403aedf0aac9a26ff6fd1f1cca8532528e9b0.tar.xz |
Merge to XFA: Cleanup parts of fpdf_render_loadimage.cpp.
Original URL: https://codereview.chromium.org/890883006
(cherry picked from commit 3f41851972a18762164d7110a82da3baed564b80)
Review URL: https://codereview.chromium.org/966013002
Diffstat (limited to 'core/src/fpdfapi/fpdf_render/render_int.h')
-rw-r--r-- | core/src/fpdfapi/fpdf_render/render_int.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h index bd7d375837..70c41ca93c 100644 --- a/core/src/fpdfapi/fpdf_render/render_int.h +++ b/core/src/fpdfapi/fpdf_render/render_int.h @@ -419,9 +419,8 @@ protected: 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; @@ -429,9 +428,15 @@ protected: 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; |