From db0be96179f0cd5f1787564cbccf86320a4d54ae Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 16 Oct 2015 14:00:21 -0700 Subject: Merge to XFA: Introduce CPDFPageFromFPFDPage() Original Review URL: https://codereview.chromium.org/1406543004 . (cherry picked from commit 943ea142b6a7e6edc91fe3c307013129e6eb0ef3) R=thestig@chromium.org Review URL: https://codereview.chromium.org/1411623002 . --- fpdfsdk/src/fpdf_transformpage.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'fpdfsdk/src/fpdf_transformpage.cpp') diff --git a/fpdfsdk/src/fpdf_transformpage.cpp b/fpdfsdk/src/fpdf_transformpage.cpp index dbf97aa2f0..132f6683d0 100644 --- a/fpdfsdk/src/fpdf_transformpage.cpp +++ b/fpdfsdk/src/fpdf_transformpage.cpp @@ -11,10 +11,6 @@ namespace { -CPDF_Page* GetPageFromFPDFPage(FPDF_PAGE page) { - return page ? static_cast(page)->GetPDFPage() : nullptr; -} - void SetBoundingBox(CPDF_Page* page, const CFX_ByteStringC& key, float left, @@ -55,7 +51,7 @@ DLLEXPORT void STDCALL FPDFPage_SetMediaBox(FPDF_PAGE page, float bottom, float right, float top) { - CPDF_Page* pPage = GetPageFromFPDFPage(page); + CPDF_Page* pPage = CPDFPageFromFPDFPage(page); if (!pPage) return; @@ -67,7 +63,7 @@ DLLEXPORT void STDCALL FPDFPage_SetCropBox(FPDF_PAGE page, float bottom, float right, float top) { - CPDF_Page* pPage = GetPageFromFPDFPage(page); + CPDF_Page* pPage = CPDFPageFromFPDFPage(page); if (!pPage) return; @@ -79,7 +75,7 @@ DLLEXPORT FPDF_BOOL STDCALL FPDFPage_GetMediaBox(FPDF_PAGE page, float* bottom, float* right, float* top) { - CPDF_Page* pPage = GetPageFromFPDFPage(page); + CPDF_Page* pPage = CPDFPageFromFPDFPage(page); return pPage && GetBoundingBox(pPage, "MediaBox", left, bottom, right, top); } @@ -88,14 +84,14 @@ DLLEXPORT FPDF_BOOL STDCALL FPDFPage_GetCropBox(FPDF_PAGE page, float* bottom, float* right, float* top) { - CPDF_Page* pPage = GetPageFromFPDFPage(page); + CPDF_Page* pPage = CPDFPageFromFPDFPage(page); return pPage && GetBoundingBox(pPage, "CropBox", left, bottom, right, top); } DLLEXPORT FPDF_BOOL STDCALL FPDFPage_TransFormWithClip(FPDF_PAGE page, FS_MATRIX* matrix, FS_RECTF* clipRect) { - CPDF_Page* pPage = GetPageFromFPDFPage(page); + CPDF_Page* pPage = CPDFPageFromFPDFPage(page); if (!pPage) return FALSE; @@ -268,7 +264,7 @@ void OutputPath(CFX_ByteTextBuf& buf, CPDF_Path path) { DLLEXPORT void STDCALL FPDFPage_InsertClipPath(FPDF_PAGE page, FPDF_CLIPPATH clipPath) { - CPDF_Page* pPage = GetPageFromFPDFPage(page); + CPDF_Page* pPage = CPDFPageFromFPDFPage(page); if (!pPage) return; -- cgit v1.2.3