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 /core | |
| 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 'core')
| -rw-r--r-- | core/src/fpdftext/fpdf_text_int.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index c28647dc17..5ed0e01ab9 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -37,13 +37,13 @@ FX_BOOL _IsIgnoreSpaceCharacter(FX_WCHAR curChar) FX_FLOAT _NormalizeThreshold(FX_FLOAT threshold) { if (threshold < 300) { - return threshold / 2.0; + return threshold / 2.0f; } else if (threshold < 500) { - return threshold / 4.0; + return threshold / 4.0f; } else if (threshold < 700) { - return threshold / 5.0; + return threshold / 5.0f; } - return threshold / 6.0; + return threshold / 6.0f; } FX_FLOAT _CalculateBaseSpace(const CPDF_TextObject* pTextObj, |