diff options
| author | Bruce Dawson <brucedawson@google.com> | 2014-12-23 12:21:02 -0800 |
|---|---|---|
| committer | Bruce Dawson <brucedawson@google.com> | 2014-12-23 12:21:02 -0800 |
| commit | 0a476d22c89eb99d36dfd6c9955dd12d1513a870 (patch) | |
| tree | 6f66fd7da1565546bd1b0d0447d827463c1d5988 /core/src/fxcrt/fx_extension.cpp | |
| parent | 1be4117d0ea336203680c64d9d0a1ae1d5a6cf61 (diff) | |
| download | pdfium-0a476d22c89eb99d36dfd6c9955dd12d1513a870.tar.xz | |
XFA: merge patch from CL 733693003, getting rid of more casts
Getting rid of more (FX_LPCWSTR) casts and fixing two bugs revealed by this.
Since casts to FX_LPCWSTR have been shown to hide bugs I tried removing
more of them, targeting those places where a cast was used to force a
conversion from CFX_WideString to FX_LPCWSTR, replacing these casts with
calls to the newly added .c_str() function. This revealed two places
where the cast was hiding a bug -- where ->c_str() was required instead!
This removes ~33 FX_LPCWSTR casts and there are ~31 left, many of which
will go away in some future change.
Also includes this change:
Removing unnecessary casts from wchar_t* to wchar_t*, by various names.
Original patch from Bruce Dawson(brucedawson@chromium.org)
TBR=bo_xu@foxitsoftware.com, tsepez@chromium.org
Review URL: https://codereview.chromium.org/811593007
Diffstat (limited to 'core/src/fxcrt/fx_extension.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_extension.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fxcrt/fx_extension.cpp b/core/src/fxcrt/fx_extension.cpp index 330c675457..e74c52d4a8 100644 --- a/core/src/fxcrt/fx_extension.cpp +++ b/core/src/fxcrt/fx_extension.cpp @@ -158,7 +158,7 @@ FX_FLOAT FXSYS_strtof(FX_LPCSTR pcsStr, FX_INT32 iLength, FX_INT32 *pUsedLen) iLength = (FX_INT32)FXSYS_strlen(pcsStr); } CFX_WideString ws = CFX_WideString::FromLocal(pcsStr, iLength); - return FXSYS_wcstof((FX_LPCWSTR)ws, iLength, pUsedLen); + return FXSYS_wcstof(ws.c_str(), iLength, pUsedLen); } FX_FLOAT FXSYS_wcstof(FX_LPCWSTR pwsStr, FX_INT32 iLength, FX_INT32 *pUsedLen) { |