diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-10-13 15:49:36 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-10-13 15:49:36 -0700 |
commit | 468e5896007c7fe7bb283c0161d807a76f403308 (patch) | |
tree | ae287c896702c071e58766fd2643ab7a803c9a66 /fpdfsdk/src/fpdf_flatten.cpp | |
parent | 3342090d65e852f3f37a8f04d3fbe3ff2467d05c (diff) | |
download | pdfium-468e5896007c7fe7bb283c0161d807a76f403308.tar.xz |
Changes to XFA to more closely match master.
These files should change in XFA in order to reduce the number of
"noise diffs" between master and XFA as seen in
https://codereview.chromium.org/1399273003/
These include: blank lines and missed merges:
3c012fe else-after-returns (partial)
fb07e28 Tidy up CPDFDOC_Environment (partial, consts missing).
624b166 Allow FPDFBookmark_GetFirstChild to return the top level bookmark
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1403063003 .
Diffstat (limited to 'fpdfsdk/src/fpdf_flatten.cpp')
-rw-r--r-- | fpdfsdk/src/fpdf_flatten.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp index 3619ef4a99..73410b6c39 100644 --- a/fpdfsdk/src/fpdf_flatten.cpp +++ b/fpdfsdk/src/fpdf_flatten.cpp @@ -362,12 +362,10 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) { if (!rcOriginalMB.IsEmpty()) { CPDF_Array* pMediaBox = new CPDF_Array(); - pMediaBox->Add(new CPDF_Number(rcOriginalMB.left)); pMediaBox->Add(new CPDF_Number(rcOriginalMB.bottom)); pMediaBox->Add(new CPDF_Number(rcOriginalMB.right)); pMediaBox->Add(new CPDF_Number(rcOriginalMB.top)); - pPageDict->SetAt("MediaBox", pMediaBox); } @@ -380,8 +378,7 @@ DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag) { pPageDict->SetAt("ArtBox", pCropBox); } - CPDF_Dictionary* pRes = NULL; - pRes = pPageDict->GetDict("Resources"); + CPDF_Dictionary* pRes = pPageDict->GetDict("Resources"); if (!pRes) { pRes = new CPDF_Dictionary; pPageDict->SetAt("Resources", pRes); |