summaryrefslogtreecommitdiff
path: root/core/fpdfapi/fpdf_font/cpdf_font.cpp
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-06-07 21:56:50 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-07 21:56:50 -0700
commita431e238ee42025cce44c3a76dd07c470d7f51ec (patch)
treedb9761e5b59b30df8d5cf91a283dcb6db58f75f2 /core/fpdfapi/fpdf_font/cpdf_font.cpp
parentf27aeec59186e7d11a3a2167572617fd5ed42941 (diff)
downloadpdfium-a431e238ee42025cce44c3a76dd07c470d7f51ec.tar.xz
Avoid const-cast in CPDF_Font
Introduce a logically const initialization (via mutable members) so that this can happen lazily under const methods. Review-Url: https://codereview.chromium.org/2045033002
Diffstat (limited to 'core/fpdfapi/fpdf_font/cpdf_font.cpp')
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_font.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fpdfapi/fpdf_font/cpdf_font.cpp b/core/fpdfapi/fpdf_font/cpdf_font.cpp
index 78bdeeffaa..c15ac6b445 100644
--- a/core/fpdfapi/fpdf_font/cpdf_font.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_font.cpp
@@ -165,7 +165,7 @@ void CPDF_Font::AppendChar(CFX_ByteString& str, uint32_t charcode) const {
CFX_WideString CPDF_Font::UnicodeFromCharCode(uint32_t charcode) const {
if (!m_bToUnicodeLoaded)
- ((CPDF_Font*)this)->LoadUnicodeMap();
+ LoadUnicodeMap();
if (m_pToUnicodeMap)
return m_pToUnicodeMap->Lookup(charcode);
@@ -174,7 +174,7 @@ CFX_WideString CPDF_Font::UnicodeFromCharCode(uint32_t charcode) const {
uint32_t CPDF_Font::CharCodeFromUnicode(FX_WCHAR unicode) const {
if (!m_bToUnicodeLoaded)
- ((CPDF_Font*)this)->LoadUnicodeMap();
+ LoadUnicodeMap();
if (m_pToUnicodeMap)
return m_pToUnicodeMap->ReverseLookup(unicode);
@@ -294,7 +294,7 @@ void CPDF_Font::CheckFontMetrics() {
}
}
-void CPDF_Font::LoadUnicodeMap() {
+void CPDF_Font::LoadUnicodeMap() const {
m_bToUnicodeLoaded = TRUE;
CPDF_Stream* pStream = m_pFontDict->GetStreamBy("ToUnicode");
if (!pStream) {