diff options
| author | Bruce Dawson <brucedawson@google.com> | 2015-01-08 11:47:49 -0800 |
|---|---|---|
| committer | Bruce Dawson <brucedawson@google.com> | 2015-01-08 11:47:49 -0800 |
| commit | 3f49aa3ba3e8ba2fcedc8e2e2a88f3b06efd52b9 (patch) | |
| tree | 02773586b1bb5372282bc0c30e31e7aedbb4f9a5 /fpdfsdk | |
| parent | 5d3a4c83fc0a41b6b04d8f7022a9db3bc04ba73e (diff) | |
| download | pdfium-3f49aa3ba3e8ba2fcedc8e2e2a88f3b06efd52b9.tar.xz | |
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
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/include/fsdk_mgr.h | 8 | ||||
| -rw-r--r-- | fpdfsdk/src/fpdfformfill.cpp | 3 | ||||
| -rw-r--r-- | fpdfsdk/src/fsdk_mgr.cpp | 5 |
3 files changed, 10 insertions, 6 deletions
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index cbe47418fc..357be3cf0f 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -476,10 +476,10 @@ public: double bottom; m_pInfo->FFI_GetPageViewRect(m_pInfo, page, &left, &top, &right, &bottom); - dstRect.left = left; - dstRect.top = top < bottom? bottom:top; - dstRect.bottom = top < bottom? top:bottom; - dstRect.right = right; + dstRect.left = static_cast<float>(left); + dstRect.top = static_cast<float>(top < bottom ? bottom : top); + dstRect.bottom = static_cast<float>(top < bottom ? top : bottom); + dstRect.right = static_cast<float>(right); } } 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<FX_FLOAT>(page_x), + static_cast<FX_FLOAT>(page_y))) { pWidgetIterator->Release(); return FPDF_FORMFIELD_XFA; } diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index c4cee6f4d8..f134b790a9 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -678,7 +678,10 @@ void CPDFSDK_PageView::PageView_OnDraw(CFX_RenderDevice* pDevice, CPDF_Matrix* p gs.Create(pDevice); if (pClip) { CFX_RectF rectClip; - rectClip.Set(pClip->left, pClip->top, pClip->Width(), pClip->Height()); + rectClip.Set(static_cast<FX_FLOAT>(pClip->left), + static_cast<FX_FLOAT>(pClip->top), + static_cast<FX_FLOAT>(pClip->Width()), + static_cast<FX_FLOAT>(pClip->Height())); gs.SetClipRect(rectClip); } IXFA_RenderContext* pRenderContext = XFA_RenderContext_Create(); |