diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-06-20 20:32:04 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-20 20:32:04 +0000 |
| commit | c62e8489042c5efaa3b666846b38a52da3b91481 (patch) | |
| tree | f0a1ef59f861bbd8e9ba81c6fb274f44d69450ea /core/fpdfapi | |
| parent | b6b01cb2cbaf6b38736f4dfebb9b6cdc243960f9 (diff) | |
| download | pdfium-c62e8489042c5efaa3b666846b38a52da3b91481.tar.xz | |
Avoid more .c_str() usage, part 3
Change-Id: I5dfadcb68e640235be6e3eb7c8d57ae3b8013d26
Reviewed-on: https://pdfium-review.googlesource.com/35691
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi')
| -rw-r--r-- | core/fpdfapi/font/cpdf_cmapmanager.cpp | 12 | ||||
| -rw-r--r-- | core/fpdfapi/font/cpdf_cmapmanager.h | 3 |
2 files changed, 6 insertions, 9 deletions
diff --git a/core/fpdfapi/font/cpdf_cmapmanager.cpp b/core/fpdfapi/font/cpdf_cmapmanager.cpp index 53183af340..62a2013448 100644 --- a/core/fpdfapi/font/cpdf_cmapmanager.cpp +++ b/core/fpdfapi/font/cpdf_cmapmanager.cpp @@ -29,15 +29,13 @@ RetainPtr<CPDF_CMap> CPDF_CMapManager::GetPredefinedCMap(const ByteString& name, return pCMap; } -RetainPtr<CPDF_CMap> CPDF_CMapManager::LoadPredefinedCMap( - const ByteString& name, - bool bPromptCJK) { - const char* pname = name.c_str(); - if (*pname == '/') - pname++; +RetainPtr<CPDF_CMap> CPDF_CMapManager::LoadPredefinedCMap(ByteString name, + bool bPromptCJK) { + if (!name.IsEmpty() && name[0] == '/') + name = name.Right(name.GetLength() - 1); auto pCMap = pdfium::MakeRetain<CPDF_CMap>(); - pCMap->LoadPredefined(this, pname, bPromptCJK); + pCMap->LoadPredefined(this, name, bPromptCJK); return pCMap; } diff --git a/core/fpdfapi/font/cpdf_cmapmanager.h b/core/fpdfapi/font/cpdf_cmapmanager.h index 089eb3d705..47a0be063f 100644 --- a/core/fpdfapi/font/cpdf_cmapmanager.h +++ b/core/fpdfapi/font/cpdf_cmapmanager.h @@ -24,8 +24,7 @@ class CPDF_CMapManager { CPDF_CID2UnicodeMap* GetCID2UnicodeMap(CIDSet charset, bool bPromptCJK); private: - RetainPtr<CPDF_CMap> LoadPredefinedCMap(const ByteString& name, - bool bPromptCJK); + RetainPtr<CPDF_CMap> LoadPredefinedCMap(ByteString name, bool bPromptCJK); std::unique_ptr<CPDF_CID2UnicodeMap> LoadCID2UnicodeMap(CIDSet charset, bool bPromptCJK); |