diff options
author | Lei Zhang <thestig@chromium.org> | 2015-08-13 15:43:09 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-08-13 15:43:09 -0700 |
commit | c9a05f1c90860a97dbe4b8014bc4584bfa3a4580 (patch) | |
tree | 53af7483204d0bd5d040f2aa362294c34156c6fd /core/include | |
parent | ae35176b8b3adf2e8c8b5f30eaad93c5f47187f1 (diff) | |
download | pdfium-c9a05f1c90860a97dbe4b8014bc4584bfa3a4580.tar.xz |
Cleanup: Remove unused CPDF_Stream::Clone().
Cloning a CPDF_Stream actually happens via CPDF_Object::Clone().
Transitively, remove:
- GetStreamFilter()
-- all the filters.
R=jam@chromium.org
Review URL: https://codereview.chromium.org/1288543002 .
Diffstat (limited to 'core/include')
-rw-r--r-- | core/include/fpdfapi/fpdf_objects.h | 40 | ||||
-rw-r--r-- | core/include/fxcrt/fx_basic.h | 30 |
2 files changed, 0 insertions, 70 deletions
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h index 250b6e00d8..c2d838d35b 100644 --- a/core/include/fpdfapi/fpdf_objects.h +++ b/core/include/fpdfapi/fpdf_objects.h @@ -37,8 +37,6 @@ class IFX_FileRead; #define PDFOBJ_NULL 8 #define PDFOBJ_REFERENCE 9 -typedef IFX_FileStream* (*FPDF_LPFCloneStreamCallback)(CPDF_Stream* pStream, - void* pUserData); class CPDF_Object { public: int GetType() const { return m_Type; } @@ -427,8 +425,6 @@ class CPDF_Stream : public CPDF_Object { FX_BOOL Identical(CPDF_Stream* pOther) const; - CPDF_StreamFilter* GetStreamFilter(FX_BOOL bRaw = FALSE) const; - FX_DWORD GetRawSize() const { return m_dwSize; } FX_BOOL ReadRawData(FX_FILESIZE start_pos, @@ -437,10 +433,6 @@ class CPDF_Stream : public CPDF_Object { FX_BOOL IsMemoryBased() const { return m_GenNum == (FX_DWORD)-1; } - CPDF_Stream* Clone(FX_BOOL bDirect, - FPDF_LPFCloneStreamCallback lpfCallback, - void* pUserData) const; - protected: ~CPDF_Stream(); @@ -507,39 +499,7 @@ class CPDF_StreamAcc { uint8_t* m_pSrcData; }; -CFX_DataFilter* FPDF_CreateFilter(const CFX_ByteStringC& name, - const CPDF_Dictionary* pParam, - int width = 0, - int height = 0); -#define FPDF_FILTER_BUFFER_SIZE 20480 -class CPDF_StreamFilter { - public: - ~CPDF_StreamFilter(); - - FX_DWORD ReadBlock(uint8_t* buffer, FX_DWORD size); - - FX_DWORD GetSrcPos() { return m_SrcOffset; } - - const CPDF_Stream* GetStream() { return m_pStream; } - - protected: - CPDF_StreamFilter() {} - FX_DWORD ReadLeftOver(uint8_t* buffer, FX_DWORD buf_size); - - const CPDF_Stream* m_pStream; - - CFX_DataFilter* m_pFilter; - - CFX_BinaryBuf* m_pBuffer; - - FX_DWORD m_BufOffset; - - FX_DWORD m_SrcOffset; - - uint8_t m_SrcBuffer[FPDF_FILTER_BUFFER_SIZE]; - friend class CPDF_Stream; -}; class CPDF_Null : public CPDF_Object { public: static CPDF_Null* Create() { return new CPDF_Null(); } diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index 73b99be549..cd6d4e048d 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -1032,36 +1032,6 @@ class IFX_Pause { virtual ~IFX_Pause() {} virtual FX_BOOL NeedToPauseNow() = 0; }; -class CFX_DataFilter { - public: - virtual ~CFX_DataFilter(); - - void SetDestFilter(CFX_DataFilter* pFilter); - - FX_BOOL IsEOF() const { return m_bEOF; } - - FX_DWORD GetSrcPos() { return m_SrcPos; } - - void FilterIn(const uint8_t* src_buf, - FX_DWORD src_size, - CFX_BinaryBuf& dest_buf); - - void FilterFinish(CFX_BinaryBuf& dest_buf); - - protected: - CFX_DataFilter(); - virtual void v_FilterIn(const uint8_t* src_buf, - FX_DWORD src_size, - CFX_BinaryBuf& dest_buf) = 0; - virtual void v_FilterFinish(CFX_BinaryBuf& dest_buf) = 0; - void ReportEOF(FX_DWORD left_input); - - FX_BOOL m_bEOF; - - FX_DWORD m_SrcPos; - - CFX_DataFilter* m_pDestFilter; -}; template <typename T> class CFX_AutoRestorer { |