diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-08-20 14:59:45 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-08-20 14:59:45 -0700 |
| commit | f85f4e42838e9d4c2cdbcd365970d42de6f826a0 (patch) | |
| tree | f79d4dce64f64d6862702aa3e7b0d608f79ad4ce /core/src/fpdfapi/fpdf_render/render_int.h | |
| parent | 5417f067844892644486d7b0581c247904059a88 (diff) | |
| download | pdfium-f85f4e42838e9d4c2cdbcd365970d42de6f826a0.tar.xz | |
Merge to XFA: Fix some -Wmaybe-uninitialized errors.
- Break up CPDF_DIBSource::DownSampleScanline() into smaller functions.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1287843004 .
(cherry picked from commit 9ae9ae2a68439cbc84a719c0dacf6984703e77cb)
Review URL: https://codereview.chromium.org/1304873002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_render/render_int.h')
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/render_int.h | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h index e195472ac1..4f86996589 100644 --- a/core/src/fpdfapi/fpdf_render/render_int.h +++ b/core/src/fpdfapi/fpdf_render/render_int.h @@ -527,7 +527,6 @@ class CPDF_DIBSource : public CFX_DIBSource { void ReleaseBitmap(CFX_DIBitmap*) const; void ClearImageData(); - public: int StartLoadDIBSource(CPDF_Document* pDoc, const CPDF_Stream* pStream, FX_BOOL bHasMask, @@ -551,7 +550,7 @@ class CPDF_DIBSource : public CFX_DIBSource { CPDF_Object* m_pMaskStream; FX_BOOL m_bHasMask; - protected: + private: FX_BOOL LoadColorInfo(CPDF_Dictionary* pFormResources, CPDF_Dictionary* pPageResources); DIB_COMP_DATA* GetDecodeAndMaskArray(FX_BOOL& bDefaultDecode, @@ -564,6 +563,35 @@ class CPDF_DIBSource : public CFX_DIBSource { void TranslateScanline24bpp(uint8_t* dest_scan, const uint8_t* src_scan) const; void ValidateDictParam(); + void DownSampleScanline1Bit(int orig_Bpp, + int dest_Bpp, + FX_DWORD src_width, + const uint8_t* pSrcLine, + uint8_t* dest_scan, + int dest_width, + FX_BOOL bFlipX, + int clip_left, + int clip_width) const; + void DownSampleScanline8Bit(int orig_Bpp, + int dest_Bpp, + FX_DWORD src_width, + const uint8_t* pSrcLine, + uint8_t* dest_scan, + int dest_width, + FX_BOOL bFlipX, + int clip_left, + int clip_width) const; + void DownSampleScanline32Bit(int orig_Bpp, + int dest_Bpp, + FX_DWORD src_width, + const uint8_t* pSrcLine, + uint8_t* dest_scan, + int dest_width, + FX_BOOL bFlipX, + int clip_left, + int clip_width) const; + FX_BOOL TransMask() const; + CPDF_Document* m_pDocument; const CPDF_Stream* m_pStream; CPDF_StreamAcc* m_pStreamAcc; |