diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-27 12:08:12 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-27 12:08:12 -0700 |
| commit | 8d2aae7ee320da3a8ffe01c57e38b3f98443257d (patch) | |
| tree | e694c6f82ec72fa46e6172b4475996b30d3f6a3a /fpdfsdk/src/fpdf_sysfontinfo.cpp | |
| parent | ff46aaf499edcf153ee2f57c7016587aa96dcfa0 (diff) | |
| download | pdfium-8d2aae7ee320da3a8ffe01c57e38b3f98443257d.tar.xz | |
Revert "FX Bool considered harmful, part 3"
This reverts commit ff46aaf499edcf153ee2f57c7016587aa96dcfa0.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1255293002 .
Diffstat (limited to 'fpdfsdk/src/fpdf_sysfontinfo.cpp')
| -rw-r--r-- | fpdfsdk/src/fpdf_sysfontinfo.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp index 691710798c..cf0cdd915b 100644 --- a/fpdfsdk/src/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/src/fpdf_sysfontinfo.cpp @@ -20,16 +20,16 @@ public: delete this; } - virtual bool EnumFontList(CFX_FontMapper* pMapper) override + virtual FX_BOOL EnumFontList(CFX_FontMapper* pMapper) override { if (m_pInfo->EnumFonts) { m_pInfo->EnumFonts(m_pInfo, pMapper); - return true; + return TRUE; } - return false; + return FALSE; } - virtual void* MapFont(int weight, bool bItalic, int charset, int pitch_family, const FX_CHAR* family, int& iExact) override + virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* family, int& iExact) override { if (m_pInfo->MapFont) return m_pInfo->MapFont(m_pInfo, weight, bItalic, charset, pitch_family, family, &iExact); @@ -50,25 +50,25 @@ public: return 0; } - virtual bool GetFaceName(void* hFont, CFX_ByteString& name) override + virtual FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) override { - if (m_pInfo->GetFaceName == NULL) return false; + if (m_pInfo->GetFaceName == NULL) return FALSE; FX_DWORD size = m_pInfo->GetFaceName(m_pInfo, hFont, NULL, 0); - if (size == 0) return false; + if (size == 0) return FALSE; char* buffer = FX_Alloc(char, size); size = m_pInfo->GetFaceName(m_pInfo, hFont, buffer, size); name = CFX_ByteString(buffer, size); FX_Free(buffer); - return true; + return TRUE; } - virtual bool GetFontCharset(void* hFont, int& charset) override + virtual FX_BOOL GetFontCharset(void* hFont, int& charset) override { if (m_pInfo->GetFontCharset) { charset = m_pInfo->GetFontCharset(m_pInfo, hFont); - return true; + return TRUE; } - return false; + return FALSE; } virtual void DeleteFont(void* hFont) override |