diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-27 11:47:29 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-27 11:47:29 -0700 |
| commit | e6f11a7b95e26affba59a7057776a787056af8df (patch) | |
| tree | ac7e527683debb15df04102b9fe333e552965909 /core/include | |
| parent | f7a7d7e07396c3a0fae617ed8f15f29fd491bc3a (diff) | |
| download | pdfium-e6f11a7b95e26affba59a7057776a787056af8df.tar.xz | |
Reduce usage of operator LPCWSTR from CFX_WideString().
This involves adding some explicit c_str() calls. Doing so flagged
PDF_EncodeText() and FindOptionValue() as having suboptimal signatures, in
that we are often throwing away a perfectly fine length and recomputing it.
There are still some platform-specific code that needs the operator.
R=brucedawson@chromium.org
Review URL: https://codereview.chromium.org/1101933003
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fpdfapi/fpdf_parser.h | 7 | ||||
| -rw-r--r-- | core/include/fpdfdoc/fpdf_doc.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index c72acc834f..20766702e2 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -793,9 +793,14 @@ CFX_ByteString PDF_NameDecode(FX_BSTR orig); CFX_ByteString PDF_NameDecode(const CFX_ByteString& orig); CFX_ByteString PDF_NameEncode(const CFX_ByteString& orig); CFX_ByteString PDF_EncodeString(const CFX_ByteString& src, FX_BOOL bHex = FALSE); -CFX_WideString PDF_DecodeText(const CFX_ByteString& str, CFX_CharMap* pCharMap = NULL); CFX_WideString PDF_DecodeText(FX_LPCBYTE pData, FX_DWORD size, CFX_CharMap* pCharMap = NULL); +inline CFX_WideString PDF_DecodeText(const CFX_ByteString& bstr, CFX_CharMap* pCharMap = NULL) { + return PDF_DecodeText((FX_LPCBYTE)bstr.c_str(), bstr.GetLength(), pCharMap); +} CFX_ByteString PDF_EncodeText(FX_LPCWSTR pString, int len = -1, CFX_CharMap* pCharMap = NULL); +inline CFX_ByteString PDF_EncodeText(const CFX_WideString& str, CFX_CharMap* pCharMap = NULL) { + return PDF_EncodeText(str.c_str(), str.GetLength(), pCharMap); +} FX_FLOAT PDF_ClipFloat(FX_FLOAT f); class CFDF_Document : public CPDF_IndirectObjects { diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h index 40d57236cd..31480f90bc 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/include/fpdfdoc/fpdf_doc.h @@ -1162,7 +1162,7 @@ public: int FindOption(CFX_WideString csOptLabel); - int FindOptionValue(FX_LPCWSTR csOptValue, int iStartIndex = 0); + int FindOptionValue(const CFX_WideString& csOptValue, int iStartIndex = 0); |