diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-21 15:55:42 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-21 15:55:42 -0700 |
| commit | 69ceb6a9761b3ccb228a2405e9a493a3666e0601 (patch) | |
| tree | aeda419b1fc75d5c2d2147b172edd47ae12298ac /fpdfsdk/src/fpdfview.cpp | |
| parent | 3b2ab45f0a883046a7c457e8435b5a9b2c1c4156 (diff) | |
| download | pdfium-69ceb6a9761b3ccb228a2405e9a493a3666e0601.tar.xz | |
More master side changes for convergence with XFA.
- Add new CPDFSDK_Document::GetPDFDocument()
- FPDFDocumentFromCPDFDocument() to match XFA
- rename some JS variables to be consistent with XFA
- remove unused param from CJS_GlobalData().
- kill dead code used XFA only.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1413883005 .
Diffstat (limited to 'fpdfsdk/src/fpdfview.cpp')
| -rw-r--r-- | fpdfsdk/src/fpdfview.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index 0d6dcf29f1..c8c2c73c9a 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -20,6 +20,10 @@ CPDF_Document* CPDFDocumentFromFPDFDocument(FPDF_DOCUMENT doc) { return static_cast<CPDF_Document*>(doc); } +FPDF_DOCUMENT FPDFDocumentFromCPDFDocument(CPDF_Document* doc) { + return static_cast<FPDF_DOCUMENT>(doc); +} + CPDF_Page* CPDFPageFromFPDFPage(FPDF_PAGE page) { return static_cast<CPDF_Page*>(page); } @@ -204,7 +208,7 @@ DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadMemDocument(const void* data_buf, CPDF_Document* pDoc = NULL; pDoc = pParser ? pParser->GetDocument() : NULL; CheckUnSupportError(pDoc, err_code); - return pParser->GetDocument(); + return FPDFDocumentFromCPDFDocument(pParser->GetDocument()); } DLLEXPORT FPDF_DOCUMENT STDCALL @@ -222,7 +226,7 @@ FPDF_LoadCustomDocument(FPDF_FILEACCESS* pFileAccess, CPDF_Document* pDoc = NULL; pDoc = pParser ? pParser->GetDocument() : NULL; CheckUnSupportError(pDoc, err_code); - return pParser->GetDocument(); + return FPDFDocumentFromCPDFDocument(pParser->GetDocument()); } DLLEXPORT FPDF_BOOL STDCALL FPDF_GetFileVersion(FPDF_DOCUMENT doc, |