summaryrefslogtreecommitdiff
path: root/xfa/fgas
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fgas')
-rw-r--r--xfa/fgas/crt/cfgas_formatstring_unittest.cpp2
-rw-r--r--xfa/fgas/font/cfgas_fontmgr.cpp12
-rw-r--r--xfa/fgas/font/cfgas_fontmgr.h12
-rw-r--r--xfa/fgas/font/cfgas_gefont.cpp14
-rw-r--r--xfa/fgas/font/cfgas_gefont.h6
-rw-r--r--xfa/fgas/font/fgas_fontutils.cpp8
-rw-r--r--xfa/fgas/layout/cfx_rtfbreak.cpp2
-rw-r--r--xfa/fgas/layout/cfx_txtbreak.cpp2
8 files changed, 29 insertions, 29 deletions
diff --git a/xfa/fgas/crt/cfgas_formatstring_unittest.cpp b/xfa/fgas/crt/cfgas_formatstring_unittest.cpp
index b3d42f655e..51c001090c 100644
--- a/xfa/fgas/crt/cfgas_formatstring_unittest.cpp
+++ b/xfa/fgas/crt/cfgas_formatstring_unittest.cpp
@@ -32,7 +32,7 @@ class CFGAS_FormatStringTest : public testing::Test {
}
void SetTZ(const char* tz) {
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
_putenv_s("TZ", tz);
_tzset();
#else
diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp
index db6c4f1867..4eddfd2d6b 100644
--- a/xfa/fgas/font/cfgas_fontmgr.cpp
+++ b/xfa/fgas/font/cfgas_fontmgr.cpp
@@ -21,7 +21,7 @@
#include "xfa/fgas/font/cfgas_gefont.h"
#include "xfa/fgas/font/fgas_fontutils.h"
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
namespace {
@@ -437,17 +437,17 @@ FX_LPEnumAllFonts FX_GetDefFontEnumerator() {
return FX_EnumGdiFonts;
}
-#else // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#else // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
namespace {
constexpr const char* g_FontFolders[] = {
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_
+#if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_
"/usr/share/fonts", "/usr/share/X11/fonts/Type1",
"/usr/share/X11/fonts/TTF", "/usr/local/share/fonts",
-#elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#elif _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
"~/Library/Fonts", "/Library/Fonts", "/System/Library/Fonts",
-#elif _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
+#elif _FX_PLATFORM_ == _FX_PLATFORM_ANDROID_
"/system/fonts",
#endif
};
@@ -1256,4 +1256,4 @@ int32_t CFGAS_FontMgr::IsPartName(const WideString& Name1,
return 0;
}
-#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h
index 0b17b1d133..76b65f8719 100644
--- a/xfa/fgas/font/cfgas_fontmgr.h
+++ b/xfa/fgas/font/cfgas_fontmgr.h
@@ -36,7 +36,7 @@
class CFX_FontSourceEnum_File;
class CFGAS_GEFont;
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
#define FX_FONTMATCHPARA_MatchStyle 0x01
struct FX_FONTMATCHPARAMS {
@@ -81,7 +81,7 @@ typedef void (*FX_LPEnumAllFonts)(std::deque<FX_FONTDESCRIPTOR>* fonts,
FX_LPEnumAllFonts FX_GetDefFontEnumerator();
-#else // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#else // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
class CFX_FontDescriptor {
public:
CFX_FontDescriptor();
@@ -137,7 +137,7 @@ class CFX_FontSourceEnum_File {
std::vector<ByteString> m_FolderPaths;
};
-#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
class CFGAS_FontMgr : public Observable<CFGAS_FontMgr> {
public:
@@ -158,7 +158,7 @@ class CFGAS_FontMgr : public Observable<CFGAS_FontMgr> {
bool EnumFonts();
private:
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
RetainPtr<CFGAS_GEFont> LoadFont(const RetainPtr<CFGAS_GEFont>& pSrcFont,
uint32_t dwFontStyles,
uint16_t wCodePage);
@@ -180,7 +180,7 @@ class CFGAS_FontMgr : public Observable<CFGAS_FontMgr> {
std::map<uint32_t, RetainPtr<CFGAS_GEFont>> m_BufferFonts;
std::map<uint32_t, RetainPtr<CFGAS_GEFont>> m_StreamFonts;
std::map<uint32_t, RetainPtr<CFGAS_GEFont>> m_DeriveFonts;
-#else // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#else // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
bool EnumFontsFromFontMapper();
bool EnumFontsFromFiles();
void RegisterFace(FXFT_Face pFace, const WideString* pFaceName);
@@ -223,7 +223,7 @@ class CFGAS_FontMgr : public Observable<CFGAS_FontMgr> {
std::map<RetainPtr<CFGAS_GEFont>, RetainPtr<IFX_SeekableReadStream>>
m_IFXFont2FileRead;
std::set<wchar_t> m_FailedUnicodesSet;
-#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
};
#endif // XFA_FGAS_FONT_CFGAS_FONTMGR_H_
diff --git a/xfa/fgas/font/cfgas_gefont.cpp b/xfa/fgas/font/cfgas_gefont.cpp
index ba79d77ca0..3e7a635b51 100644
--- a/xfa/fgas/font/cfgas_gefont.cpp
+++ b/xfa/fgas/font/cfgas_gefont.cpp
@@ -21,7 +21,7 @@ RetainPtr<CFGAS_GEFont> CFGAS_GEFont::LoadFont(const wchar_t* pszFontFamily,
uint32_t dwFontStyles,
uint16_t wCodePage,
CFGAS_FontMgr* pFontMgr) {
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
if (!pFontMgr)
return nullptr;
@@ -55,7 +55,7 @@ RetainPtr<CFGAS_GEFont> CFGAS_GEFont::LoadFont(
CFGAS_GEFont::CFGAS_GEFont(CFGAS_FontMgr* pFontMgr)
:
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
m_bUseLogFontStyle(false),
m_dwLogFontStyle(0),
#endif
@@ -67,7 +67,7 @@ CFGAS_GEFont::CFGAS_GEFont(CFGAS_FontMgr* pFontMgr)
CFGAS_GEFont::CFGAS_GEFont(const RetainPtr<CFGAS_GEFont>& src,
uint32_t dwFontStyles)
:
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
m_bUseLogFontStyle(false),
m_dwLogFontStyle(0),
#endif
@@ -95,7 +95,7 @@ CFGAS_GEFont::~CFGAS_GEFont() {
delete m_pFont;
}
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
bool CFGAS_GEFont::LoadFontInternal(const wchar_t* pszFontFamily,
uint32_t dwFontStyles,
uint16_t wCodePage) {
@@ -133,7 +133,7 @@ bool CFGAS_GEFont::LoadFontInternal(const wchar_t* pszFontFamily,
return false;
return InitFont();
}
-#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
bool CFGAS_GEFont::LoadFontInternal(CFX_Font* pExternalFont) {
if (m_pFont || !pExternalFont)
@@ -183,7 +183,7 @@ WideString CFGAS_GEFont::GetFamilyName() const {
uint32_t CFGAS_GEFont::GetFontStyles() const {
ASSERT(m_pFont);
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
if (m_bUseLogFontStyle)
return m_dwLogFontStyle;
#endif
@@ -332,7 +332,7 @@ int32_t CFGAS_GEFont::GetGlyphIndex(wchar_t wUnicode,
WideString wsFamily = GetFamilyName();
RetainPtr<CFGAS_GEFont> pFont =
m_pFontMgr->GetFontByUnicode(wUnicode, GetFontStyles(), wsFamily.c_str());
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
if (!pFont)
pFont = m_pFontMgr->GetFontByUnicode(wUnicode, GetFontStyles(), nullptr);
#endif
diff --git a/xfa/fgas/font/cfgas_gefont.h b/xfa/fgas/font/cfgas_gefont.h
index 9df9ea842d..9d990094fa 100644
--- a/xfa/fgas/font/cfgas_gefont.h
+++ b/xfa/fgas/font/cfgas_gefont.h
@@ -52,7 +52,7 @@ class CFGAS_GEFont : public Retainable {
void SetFontProvider(CFGAS_PDFFontMgr* pProvider) {
m_pProvider.Reset(pProvider);
}
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
void SetLogicalFontStyle(uint32_t dwLogFontStyle) {
m_bUseLogFontStyle = true;
m_dwLogFontStyle = dwLogFontStyle;
@@ -64,7 +64,7 @@ class CFGAS_GEFont : public Retainable {
CFGAS_GEFont(const RetainPtr<CFGAS_GEFont>& src, uint32_t dwFontStyles);
~CFGAS_GEFont() override;
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
bool LoadFontInternal(const wchar_t* pszFontFamily,
uint32_t dwFontStyles,
uint16_t wCodePage);
@@ -89,7 +89,7 @@ class CFGAS_GEFont : public Retainable {
bool bCharCode = false);
WideString GetFamilyName() const;
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
bool m_bUseLogFontStyle;
uint32_t m_dwLogFontStyle;
#endif
diff --git a/xfa/fgas/font/fgas_fontutils.cpp b/xfa/fgas/font/fgas_fontutils.cpp
index bde8910682..2cf56ce7ca 100644
--- a/xfa/fgas/font/fgas_fontutils.cpp
+++ b/xfa/fgas/font/fgas_fontutils.cpp
@@ -188,7 +188,7 @@ const FGAS_FONTUSB g_FXGdiFontUSBTable[] = {
{0xFFA0, 0xFFEF, 68, 0xFFFF},
};
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
const FGAS_FontInfo g_XFAFontsMap[] = {
{0x01d5d33e, L"SimSun", L"Arial", 0, 936},
{0x01e4f102, L"YouYuan", L"Arial", 1, 936},
@@ -436,7 +436,7 @@ const FGAS_FontInfo g_XFAFontsMap[] = {
{0xfe209a82, L"LucidaCalligraphy", L"Arial", 0, 1252},
{0xfef135f8, L"AdobeHeitiStd-Regular", L"Batang,Century,Dotum", 0, 936},
};
-#elif _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_
+#elif _FX_PLATFORM_ == _FX_PLATFORM_LINUX_
const FGAS_FontInfo g_XFAFontsMap[] = {
{0x01d5d33e, L"SimSun",
L"WenQuanYi Zen Hei Mono,AR PL UMing CN,AR PL UMing HK,AR PL UMing TW,AR "
@@ -1025,7 +1025,7 @@ const FGAS_FontInfo g_XFAFontsMap[] = {
L"Sharp,WenQuanYi Micro Hei",
0, 936},
};
-#elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#elif _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
const FGAS_FontInfo g_XFAFontsMap[] = {
{0x01d5d33e, L"SimSun", L"STHeiti,Heiti TC,STFangsong", 0, 936},
{0x01e4f102, L"YouYuan", L"STHeiti,Heiti TC,STFangsong", 1, 936},
@@ -1426,7 +1426,7 @@ const FGAS_FontInfo g_XFAFontsMap[] = {
L"Kokonor,Damascus,STIXNonUnicode,STHeiti,Arial Black", 0, 1252},
{0xfef135f8, L"AdobeHeitiStd-Regular", L"Heiti TC,STHeiti", 0, 936},
};
-#elif _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
+#elif _FX_PLATFORM_ == _FX_PLATFORM_ANDROID_
const FGAS_FontInfo g_XFAFontsMap[] = {
{0x01d5d33e, L"SimSun", L"Droid Sans Fallback", 0, 936},
{0x01e4f102, L"YouYuan", L"Droid Sans Fallback", 1, 936},
diff --git a/xfa/fgas/layout/cfx_rtfbreak.cpp b/xfa/fgas/layout/cfx_rtfbreak.cpp
index 8768aa34ff..cf37030db0 100644
--- a/xfa/fgas/layout/cfx_rtfbreak.cpp
+++ b/xfa/fgas/layout/cfx_rtfbreak.cpp
@@ -730,7 +730,7 @@ int32_t CFX_RTFBreak::GetDisplayPos(const FX_RTFTEXTOBJ* pText,
if (pCharPos->m_GlyphIndex == 0xFFFF)
pCharPos->m_GlyphIndex = pFont->GetGlyphIndex(wch, false);
}
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
pCharPos->m_ExtGID = pCharPos->m_GlyphIndex;
#endif
pCharPos->m_FontCharWidth = iCharWidth;
diff --git a/xfa/fgas/layout/cfx_txtbreak.cpp b/xfa/fgas/layout/cfx_txtbreak.cpp
index 403b7e6c11..a7683bc978 100644
--- a/xfa/fgas/layout/cfx_txtbreak.cpp
+++ b/xfa/fgas/layout/cfx_txtbreak.cpp
@@ -828,7 +828,7 @@ int32_t CFX_TxtBreak::GetDisplayPos(const FX_TXTRUN* pTxtRun,
}
if (!bEmptyChar || (bEmptyChar && !bSkipSpace)) {
pCharPos->m_GlyphIndex = pFont->GetGlyphIndex(wForm, false);
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
pCharPos->m_ExtGID = pCharPos->m_GlyphIndex;
#endif
pCharPos->m_FontCharWidth = iCharWidth;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 19:32:27 +0000