From 1cd352e0a4bc19f96df199b0acfa32a344240d5e Mon Sep 17 00:00:00 2001 From: thestig Date: Tue, 7 Jun 2016 17:53:06 -0700 Subject: Get rid of NULLs in fpdfsdk/ Review-Url: https://codereview.chromium.org/2031653003 --- fpdfsdk/fpdf_sysfontinfo.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/fpdf_sysfontinfo.cpp') diff --git a/fpdfsdk/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp index 9d05903a61..2a309d9785 100644 --- a/fpdfsdk/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/fpdf_sysfontinfo.cpp @@ -36,13 +36,13 @@ class CFX_ExternalFontInfo final : public IFX_SystemFontInfo { if (m_pInfo->MapFont) return m_pInfo->MapFont(m_pInfo, weight, bItalic, charset, pitch_family, family, &iExact); - return NULL; + return nullptr; } void* GetFont(const FX_CHAR* family) override { if (m_pInfo->GetFont) return m_pInfo->GetFont(m_pInfo, family); - return NULL; + return nullptr; } uint32_t GetFontData(void* hFont, @@ -57,7 +57,7 @@ class CFX_ExternalFontInfo final : public IFX_SystemFontInfo { FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) override { if (!m_pInfo->GetFaceName) return FALSE; - uint32_t size = m_pInfo->GetFaceName(m_pInfo, hFont, NULL, 0); + uint32_t size = m_pInfo->GetFaceName(m_pInfo, hFont, nullptr, 0); if (size == 0) return FALSE; char* buffer = FX_Alloc(char, size); -- cgit v1.2.3