From 52c0fcbaf99940a51a1179f035949eab7fc67352 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 7 Aug 2018 23:29:44 +0000 Subject: Change CPDF_Font::GetFace() to HasFace(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Callers do not actually need the returned handle. Change-Id: I1b8c0be00809eb7fdae9f6e95b4b325e75f4b847 Reviewed-on: https://pdfium-review.googlesource.com/39491 Reviewed-by: Nicolás Peña Moreno Commit-Queue: Lei Zhang --- core/fpdfapi/font/cpdf_font.h | 2 +- core/fpdfapi/render/cpdf_renderstatus.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/fpdfapi/font/cpdf_font.h b/core/fpdfapi/font/cpdf_font.h index f246293c3e..c3194110cb 100644 --- a/core/fpdfapi/font/cpdf_font.h +++ b/core/fpdfapi/font/cpdf_font.h @@ -69,7 +69,7 @@ class CPDF_Font { CPDF_Dictionary* GetFontDict() const { return m_pFontDict.Get(); } void ClearFontDict() { m_pFontDict = nullptr; } bool IsStandardFont() const; - FXFT_Face GetFace() const { return m_Font.GetFace(); } + bool HasFace() const { return !!m_Font.GetFace(); } void AppendChar(ByteString* str, uint32_t charcode) const; const FX_RECT& GetFontBBox() const { return m_FontBBox; } diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp index ee3faafea3..568e350302 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.cpp +++ b/core/fpdfapi/render/cpdf_renderstatus.cpp @@ -1727,7 +1727,7 @@ bool CPDF_RenderStatus::ProcessText(CPDF_TextObject* textobj, break; case TextRenderingMode::MODE_STROKE: case TextRenderingMode::MODE_STROKE_CLIP: - if (pFont->GetFace()) + if (pFont->HasFace()) bStroke = true; else bFill = true; @@ -1735,7 +1735,7 @@ bool CPDF_RenderStatus::ProcessText(CPDF_TextObject* textobj, case TextRenderingMode::MODE_FILL_STROKE: case TextRenderingMode::MODE_FILL_STROKE_CLIP: bFill = true; - if (pFont->GetFace()) + if (pFont->HasFace()) bStroke = true; break; case TextRenderingMode::MODE_INVISIBLE: -- cgit v1.2.3