From cf22eb8ac24d944aac08d6a17c12b8a3a602c6f5 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 12 May 2015 17:28:08 -0700 Subject: Merge to XFA: Make (and verify) public/ files compile under C. The following files needed adjustment beyond a mechanical merge: fpdfsdk/src/fpdfview.cpp public/fpdf_formfill.h samples/pdfium_test.cc testing/embedder_test.cpp Original Review URL: https://codereview.chromium.org/1130843003 BUG=pdfium:158 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1137233002 --- samples/pdfium_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'samples/pdfium_test.cc') diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc index 8ab94972a9..7c6b8b965d 100644 --- a/samples/pdfium_test.cc +++ b/samples/pdfium_test.cc @@ -414,7 +414,7 @@ int Get_Block(void* param, unsigned long pos, unsigned char* pBuf, return 1; } -bool Is_Data_Avail(FX_FILEAVAIL* pThis, size_t offset, size_t size) { +FPDF_BOOL Is_Data_Avail(FX_FILEAVAIL* pThis, size_t offset, size_t size) { return true; } @@ -478,7 +478,7 @@ void RenderPdf(const std::string& name, const char* pBuf, size_t len, FPDF_FORMHANDLE form = FPDFDOC_InitFormFillEnvironment(doc, &form_callbacks); int docType = DOCTYPE_PDF; - if (FPDF_HasXFAField(doc, docType)) + if (FPDF_HasXFAField(doc, &docType)) { if (docType != DOCTYPE_PDF && !FPDF_LoadXFA(doc)) fprintf(stderr, "LoadXFA unsuccessful, continuing anyway.\n"); -- cgit v1.2.3