summaryrefslogtreecommitdiff
path: root/core/fpdfapi
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-08-07 23:29:44 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-08-07 23:29:44 +0000
commit52c0fcbaf99940a51a1179f035949eab7fc67352 (patch)
treeb0a0e809abfd8cd1254893b6ff52074fbced25d1 /core/fpdfapi
parent69e19e2c0b6753a69470840226456858cdef5773 (diff)
downloadpdfium-52c0fcbaf99940a51a1179f035949eab7fc67352.tar.xz
Change CPDF_Font::GetFace() to HasFace().
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 <npm@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi')
-rw-r--r--core/fpdfapi/font/cpdf_font.h2
-rw-r--r--core/fpdfapi/render/cpdf_renderstatus.cpp4
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: