From 3f49aa3ba3e8ba2fcedc8e2e2a88f3b06efd52b9 Mon Sep 17 00:00:00 2001 From: Bruce Dawson Date: Thu, 8 Jan 2015 11:47:49 -0800 Subject: XFA: merge patch from CL 792953005, fix most warnings Includes fixes to XFA specific warnings -- benign truncations. Bug https://code.google.com/p/pdfium/issues/detail?id=104 was filed to track changing types to avoid some truncations. Resolve all but two VC++ build warnings in pdfium. pdfium builds on Win32 have about 85 warnings (250 in the XFA branch, totaling over 480 lines!), mostly from four lines in a header file and a warning that should be disabled. This change resolves all but two of them and turns on warning-as-errors. Bugs have been filed for the two remaining warnings: https://code.google.com/p/pdfium/issues/detail?id=100 the 64-bit warnings: https://code.google.com/p/pdfium/issues/detail?id=101 and the Linux warnings: https://code.google.com/p/pdfium/issues/detail?id=102 The fix to the double->float truncation bugs will also improve code-generation. R=bo_xu@foxitsoftware.com, tsepez@chromium.org Review URL: https://codereview.chromium.org/792953005 BUG= https://code.google.com/p/pdfium/issues/detail?id=100 Review URL: https://codereview.chromium.org/834413002 --- fpdfsdk/src/fpdfformfill.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'fpdfsdk/src/fpdfformfill.cpp') diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp index 0fb32919e1..ea94925d63 100644 --- a/fpdfsdk/src/fpdfformfill.cpp +++ b/fpdfsdk/src/fpdfformfill.cpp @@ -71,7 +71,8 @@ DLLEXPORT int STDCALL FPDPage_HasFormFieldAtPoint(FPDF_FORMHANDLE hHandle, FPDF_ rcWidget.bottom -= 1.0f; rcWidget.top += 1.0f; - if (rcWidget.Contains(page_x, page_y)) { + if (rcWidget.Contains(static_cast(page_x), + static_cast(page_y))) { pWidgetIterator->Release(); return FPDF_FORMFIELD_XFA; } -- cgit v1.2.3