diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-04-07 16:58:00 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-10 16:33:54 +0000 |
| commit | ec8ff7d258ef25f7e3193572aeef220ff86784f0 (patch) | |
| tree | 1c72cae7e3b43908840c9a6881b239850933680b /fpdfsdk/pdfwindow | |
| parent | 84b596d64aab8f8c6dd6145e9c210b145fc5631a (diff) | |
| download | pdfium-ec8ff7d258ef25f7e3193572aeef220ff86784f0.tar.xz | |
Fix bytestring passing conventions, part 2.
Change pass by reference to const reference or pointer.
Change-Id: Ic007f14e6569679a846980a96cc627eac4ecd5d6
Reviewed-on: https://pdfium-review.googlesource.com/3953
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fpdfsdk/pdfwindow')
| -rw-r--r-- | fpdfsdk/pdfwindow/PWL_FontMap.cpp | 7 | ||||
| -rw-r--r-- | fpdfsdk/pdfwindow/PWL_FontMap.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/pdfwindow/PWL_FontMap.cpp index a7c42698cd..ddf496fbb0 100644 --- a/fpdfsdk/pdfwindow/PWL_FontMap.cpp +++ b/fpdfsdk/pdfwindow/PWL_FontMap.cpp @@ -180,10 +180,7 @@ int32_t CPWL_FontMap::GetFontIndex(const CFX_ByteString& sFontName, return nFontIndex; CFX_ByteString sAlias; - CPDF_Font* pFont = nullptr; - if (bFind) - pFont = FindFontSameCharset(sAlias, nCharset); - + CPDF_Font* pFont = bFind ? FindFontSameCharset(&sAlias, nCharset) : nullptr; if (!pFont) { CFX_ByteString sTemp = sFontName; pFont = AddFontToDocument(GetDocument(), sTemp, nCharset); @@ -193,7 +190,7 @@ int32_t CPWL_FontMap::GetFontIndex(const CFX_ByteString& sFontName, return AddFontData(pFont, sAlias, nCharset); } -CPDF_Font* CPWL_FontMap::FindFontSameCharset(CFX_ByteString& sFontAlias, +CPDF_Font* CPWL_FontMap::FindFontSameCharset(CFX_ByteString* sFontAlias, int32_t nCharset) { return nullptr; } diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.h b/fpdfsdk/pdfwindow/PWL_FontMap.h index c14fcd7cd3..21535305ae 100644 --- a/fpdfsdk/pdfwindow/PWL_FontMap.h +++ b/fpdfsdk/pdfwindow/PWL_FontMap.h @@ -53,7 +53,7 @@ class CPWL_FontMap : public IPVT_FontMap { protected: virtual void Initialize(); virtual CPDF_Document* GetDocument(); - virtual CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias, + virtual CPDF_Font* FindFontSameCharset(CFX_ByteString* sFontAlias, int32_t nCharset); virtual void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias); |