diff options
author | Lei Zhang <thestig@chromium.org> | 2015-10-23 15:16:01 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-10-23 15:16:01 -0700 |
commit | e5457b7376e4f2b69c691363368af6cf4df3e0d8 (patch) | |
tree | ff8888240e5c08ab7596b22aeb4c282174425f6d /core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp | |
parent | 924b7e968e3aa19e9e916f8437acbf85d92df40e (diff) | |
download | pdfium-e5457b7376e4f2b69c691363368af6cf4df3e0d8.tar.xz |
Merge to XFA: Cleanup: Remove unused CPDF_Stream::Clone().
Cloning a CPDF_Stream actually happens via CPDF_Object::Clone().
Transitively, remove:
- GetStreamFilter()
-- all the filters.
Also remove CXFA_FileRead.
R=jam@chromium.org
Review URL: https://codereview.chromium.org/1288543002 .
(cherry picked from commit c9a05f1c90860a97dbe4b8014bc4584bfa3a4580)
Review URL: https://codereview.chromium.org/1297463002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp index 5bf346367d..dfe94932da 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp @@ -945,6 +945,7 @@ void CPDF_Stream::InitStream(IFX_FileRead* pFile, CPDF_Dictionary* pDict) { m_pDict->SetAtInteger(FX_BSTRC("Length"), m_dwSize); } } + FX_BOOL CPDF_Stream::Identical(CPDF_Stream* pOther) const { if (!m_pDict) return pOther->m_pDict ? FALSE : TRUE; @@ -1016,38 +1017,7 @@ FX_BOOL CPDF_Stream::Identical(CPDF_Stream* pOther) const { } return FXSYS_memcmp(m_pDataBuf, pOther->m_pDataBuf, m_dwSize) == 0; } -CPDF_Stream* CPDF_Stream::Clone(FX_BOOL bDirect, - FPDF_LPFCloneStreamCallback lpfCallback, - void* pUserData) const { - CPDF_Dictionary* pCloneDict = (CPDF_Dictionary*)m_pDict->Clone(bDirect); - IFX_FileStream* pFS = NULL; - if (lpfCallback) { - pFS = lpfCallback((CPDF_Stream*)this, pUserData); - } - if (!pFS) { - CPDF_StreamAcc acc; - acc.LoadAllData(this, TRUE); - FX_DWORD streamSize = acc.GetSize(); - return new CPDF_Stream(acc.DetachData(), streamSize, pCloneDict); - } - CPDF_Stream* pObj = new CPDF_Stream(NULL, 0, NULL); - CPDF_StreamFilter* pSF = GetStreamFilter(TRUE); - if (pSF) { - uint8_t* pBuf = FX_Alloc(uint8_t, 4096); - FX_DWORD dwRead; - do { - dwRead = pSF->ReadBlock(pBuf, 4096); - if (dwRead) { - pFS->WriteBlock(pBuf, dwRead); - } - } while (dwRead == 4096); - pFS->Flush(); - FX_Free(pBuf); - delete pSF; - } - pObj->InitStream((IFX_FileRead*)pFS, pCloneDict); - return pObj; -} + CPDF_StreamAcc::CPDF_StreamAcc() { m_bNewBuf = FALSE; m_pData = NULL; |