From 5cc24654fb345189140acb4711ff981e1c720951 Mon Sep 17 00:00:00 2001 From: thestig Date: Tue, 26 Apr 2016 11:46:02 -0700 Subject: Clean up CPDF_Page. - Merge CPDF_Page::Load() into ctor. - Remove always nullptr param for CPDF_Page::ParseContent(). - Remove unneeded indirection in IPDF_RenderModule. - Delete CPDF_ParseOptions. - Fix up CPDF_Pattern. Review URL: https://codereview.chromium.org/1918113002 --- fpdfsdk/fpdfview.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'fpdfsdk/fpdfview.cpp') diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index dec1059e1a..2283e941a9 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -502,10 +502,10 @@ DLLEXPORT FPDF_PAGE STDCALL FPDF_LoadPage(FPDF_DOCUMENT document, #else // PDF_ENABLE_XFA CPDF_Dictionary* pDict = pDoc->GetPage(page_index); if (!pDict) - return NULL; - CPDF_Page* pPage = new CPDF_Page; - pPage->Load(pDoc, pDict); - pPage->ParseContent(nullptr); + return nullptr; + + CPDF_Page* pPage = new CPDF_Page(pDoc, pDict, true); + pPage->ParseContent(); return pPage; #endif // PDF_ENABLE_XFA } @@ -958,8 +958,8 @@ DLLEXPORT int STDCALL FPDF_GetPageSizeByIndex(FPDF_DOCUMENT document, CPDF_Dictionary* pDict = pDoc->GetPage(page_index); if (!pDict) return FALSE; - CPDF_Page page; - page.Load(pDoc, pDict); + + CPDF_Page page(pDoc, pDict, true); *width = page.GetPageWidth(); *height = page.GetPageHeight(); #endif // PDF_ENABLE_XFA -- cgit v1.2.3