diff options
| author | Bruce Dawson <brucedawson@google.com> | 2014-12-08 13:10:02 -0800 |
|---|---|---|
| committer | Bruce Dawson <brucedawson@google.com> | 2014-12-08 13:10:02 -0800 |
| commit | b69da0b96ffdad124efd1b48d51c617bb216a98e (patch) | |
| tree | 61d7c0212eaf4998591d0b941bfceb5646778062 /core/src/fxcrt/fx_basic_bstring.cpp | |
| parent | 4b87f7b5f8fe26ee4869a21a8b0b4697cba51a93 (diff) | |
| download | pdfium-b69da0b96ffdad124efd1b48d51c617bb216a98e.tar.xz | |
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)
R=bo_xu@foxitsoftware.com, tsepez@chromium.org
Review URL: https://codereview.chromium.org/733693003
Diffstat (limited to 'core/src/fxcrt/fx_basic_bstring.cpp')
| -rw-r--r-- | core/src/fxcrt/fx_basic_bstring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/src/fxcrt/fx_basic_bstring.cpp index 60153fa45a..c54148d799 100644 --- a/core/src/fxcrt/fx_basic_bstring.cpp +++ b/core/src/fxcrt/fx_basic_bstring.cpp @@ -971,7 +971,7 @@ CFX_ByteString CFX_ByteString::FromUnicode(FX_LPCWSTR str, FX_STRSIZE len) } CFX_ByteString CFX_ByteString::FromUnicode(const CFX_WideString& str) { - return FromUnicode((FX_LPCWSTR)str, str.GetLength()); + return FromUnicode(str.c_str(), str.GetLength()); } void CFX_ByteString::ConvertFrom(const CFX_WideString& str, CFX_CharMap* pCharMap) { |