From 4bd3a815393b3a6b2d9840fdd1de121deceb7b12 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 26 Jun 2018 20:49:30 +0000 Subject: Use unowned ptr in CPDF_Cmap Change-Id: Id6551957405605cf273d5d100b6db9c27ecc6e7c Reviewed-on: https://pdfium-review.googlesource.com/36131 Reviewed-by: dsinclair Commit-Queue: Tom Sepez --- core/fpdfapi/font/cpdf_cmap.cpp | 2 +- core/fpdfapi/font/cpdf_cmap.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/fpdfapi/font/cpdf_cmap.cpp b/core/fpdfapi/font/cpdf_cmap.cpp index d6b4264b6b..c761959d8b 100644 --- a/core/fpdfapi/font/cpdf_cmap.cpp +++ b/core/fpdfapi/font/cpdf_cmap.cpp @@ -317,7 +317,7 @@ uint16_t CPDF_CMap::CIDFromCharCode(uint32_t charcode) const { return static_cast(charcode); if (m_pEmbedMap) - return FPDFAPI_CIDFromCharCode(m_pEmbedMap, charcode); + return FPDFAPI_CIDFromCharCode(m_pEmbedMap.Get(), charcode); if (m_DirectCharcodeToCIDTable.empty()) return static_cast(charcode); diff --git a/core/fpdfapi/font/cpdf_cmap.h b/core/fpdfapi/font/cpdf_cmap.h index 96ccf02c0b..781f0f9439 100644 --- a/core/fpdfapi/font/cpdf_cmap.h +++ b/core/fpdfapi/font/cpdf_cmap.h @@ -73,7 +73,7 @@ class CPDF_CMap : public Retainable { } int GetCoding() const { return m_Coding; } - const FXCMAP_CMap* GetEmbedMap() const { return m_pEmbedMap; } + const FXCMAP_CMap* GetEmbedMap() const { return m_pEmbedMap.Get(); } CIDSet GetCharset() const { return m_Charset; } void SetCharset(CIDSet set) { m_Charset = set; } @@ -98,7 +98,7 @@ class CPDF_CMap : public Retainable { std::vector m_MixedFourByteLeadingRanges; std::vector m_DirectCharcodeToCIDTable; std::vector m_AdditionalCharcodeToCIDMappings; - const FXCMAP_CMap* m_pEmbedMap; + UnownedPtr m_pEmbedMap; }; #endif // CORE_FPDFAPI_FONT_CPDF_CMAP_H_ -- cgit v1.2.3