From 1b04bcc6af13669920700322052fc4ab4fad47a2 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 23 Oct 2015 12:37:42 -0700 Subject: XFA: Manually apply changes to fpdf_text.h and fx_font.h from master Driven off of https://codereview.chromium.org/1398383002/ Then make the other files as similar as possible. Note that this required changes to xfa/ code, and required adding some Set() methods. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1411833003 . --- core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp') diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp index 472e96a3c4..89ac8ac143 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp @@ -790,10 +790,10 @@ void CPDF_RenderStatus::DrawTextPathWithPattern( ProcessPath(&path, pObj2Device); } } + CFX_PathData* CPDF_Font::LoadGlyphPath(FX_DWORD charcode, int dest_width) { int glyph_index = GlyphFromCharCode(charcode); - if (m_Font.m_Face == NULL) { - return NULL; - } + if (!m_Font.GetFace()) + return nullptr; return m_Font.LoadGlyphPath(glyph_index, dest_width); } -- cgit v1.2.3