diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-02-06 16:44:10 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-02-06 16:44:10 -0800 |
| commit | 3f41851972a18762164d7110a82da3baed564b80 (patch) | |
| tree | d14cbae57ae71a66c6b8c32df2d80c812a1c41d9 /core/src/fpdfapi/fpdf_render/render_int.h | |
| parent | 72feb27fc174c2139b642eb7390fffac608f6c87 (diff) | |
| download | pdfium-3f41851972a18762164d7110a82da3baed564b80.tar.xz | |
Cleanup parts of fpdf_render_loadimage.cpp.
- Add functions to do pitch calculation.
- Delete dead code.
- Don't bother checking pointers before deleting them.
- Don't bother setting pointers to NULL in dtors.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/890883006
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; |