diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-12-11 22:12:08 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-11 22:12:08 +0000 |
| commit | 07401bae6d9f95911b144e6fabb42f19e40def49 (patch) | |
| tree | 4c7aa56beadf3bc1540ecad781e62ec8b84be4e0 /fpdfsdk | |
| parent | 4412f3d87441c135ef56420f18d9229fbe247c3e (diff) | |
| download | pdfium-07401bae6d9f95911b144e6fabb42f19e40def49.tar.xz | |
Remove default arguments to CPDF_StreamAcc::LoadAllData().
Add LoadAllDataFiltered() and LoadAllDataRaw() and update callers.
Change-Id: I9b80ee34a358db204968acdc8b1adc9db0b6b83f
Reviewed-on: https://pdfium-review.googlesource.com/20810
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/fpdf_flatten.cpp | 4 | ||||
| -rw-r--r-- | fpdfsdk/fpdfsave.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/fpdf_flatten.cpp b/fpdfsdk/fpdf_flatten.cpp index 2850c37bfb..4d06693006 100644 --- a/fpdfsdk/fpdf_flatten.cpp +++ b/fpdfsdk/fpdf_flatten.cpp @@ -198,7 +198,7 @@ void SetPageContents(const ByteString& key, if (!pContentsArray) { pContentsArray = pDocument->NewIndirect<CPDF_Array>(); auto pAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pContentsStream); - pAcc->LoadAllData(); + pAcc->LoadAllDataFiltered(); ByteString sStream = "q\n"; ByteString sBody = ByteString(pAcc->GetData(), pAcc->GetSize()); sStream = sStream + sBody + "\nQ"; @@ -394,7 +394,7 @@ FPDF_EXPORT int FPDF_CALLCONV FPDFPage_Flatten(FPDF_PAGE page, int nFlag) { pObj->GetObjNum()); auto pAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pNewXObject); - pAcc->LoadAllData(); + pAcc->LoadAllDataFiltered(); ByteString sStream(pAcc->GetData(), pAcc->GetSize()); CFX_Matrix matrix = pAPDic->GetMatrixFor("Matrix"); CFX_Matrix m = GetMatrix(rcAnnot, rcStream, matrix); diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp index a21310dfa1..ddbc994577 100644 --- a/fpdfsdk/fpdfsave.cpp +++ b/fpdfsdk/fpdfsave.cpp @@ -99,7 +99,7 @@ bool SaveXFADocumentData(CPDFXFA_Context* pContext, if (iTemplate > -1) { CPDF_Stream* pTemplateStream = pArray->GetStreamAt(iTemplate); auto pAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pTemplateStream); - pAcc->LoadAllData(); + pAcc->LoadAllDataFiltered(); RetainPtr<IFX_SeekableStream> pTemplate = pdfium::MakeRetain<CFX_MemoryStream>( const_cast<uint8_t*>(pAcc->GetData()), pAcc->GetSize(), false); diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp index 70b0f1b514..fdf0d31ea2 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp @@ -496,7 +496,7 @@ void CPDFXFA_DocEnvironment::ExportData(CXFA_FFDoc* hDoc, content.GetLength()); } auto pAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pStream); - pAcc->LoadAllData(); + pAcc->LoadAllDataFiltered(); fileWrite->WriteBlock(pAcc->GetData(), fileWrite->GetSize(), pAcc->GetSize()); } |