From 86adb658843658969041a13bf6cf0cc950ffe8ed Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 15 Oct 2015 14:51:42 -0700 Subject: Fix layering violation in CPDF_Document::FromFPDFDocument(). Make this a function in the fpdfsdk/ layer, rather than a method in the core/ layer. Nothing in core should know about public FPDF types. BUG=pdfium:217 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1396283006 . --- fpdfsdk/src/fpdfppo.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'fpdfsdk/src/fpdfppo.cpp') diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp index 50ed6607d5..2508adca7b 100644 --- a/fpdfsdk/src/fpdfppo.cpp +++ b/fpdfsdk/src/fpdfppo.cpp @@ -369,11 +369,11 @@ DLLEXPORT FPDF_BOOL STDCALL FPDF_ImportPages(FPDF_DOCUMENT dest_doc, FPDF_DOCUMENT src_doc, FPDF_BYTESTRING pagerange, int index) { - CPDF_Document* pDestDoc = CPDF_Document::FromFPDFDocument(dest_doc); + CPDF_Document* pDestDoc = CPDFDocumentFromFPDFDocument(dest_doc); if (!dest_doc) return FALSE; - CPDF_Document* pSrcDoc = CPDF_Document::FromFPDFDocument(src_doc); + CPDF_Document* pSrcDoc = CPDFDocumentFromFPDFDocument(src_doc); if (!pSrcDoc) return FALSE; @@ -395,11 +395,11 @@ DLLEXPORT FPDF_BOOL STDCALL FPDF_ImportPages(FPDF_DOCUMENT dest_doc, DLLEXPORT FPDF_BOOL STDCALL FPDF_CopyViewerPreferences(FPDF_DOCUMENT dest_doc, FPDF_DOCUMENT src_doc) { - CPDF_Document* pDstDoc = CPDF_Document::FromFPDFDocument(dest_doc); + CPDF_Document* pDstDoc = CPDFDocumentFromFPDFDocument(dest_doc); if (!pDstDoc) return FALSE; - CPDF_Document* pSrcDoc = CPDF_Document::FromFPDFDocument(src_doc); + CPDF_Document* pSrcDoc = CPDFDocumentFromFPDFDocument(src_doc); if (!pSrcDoc) return FALSE; -- cgit v1.2.3