summaryrefslogtreecommitdiff
path: root/core/fxge/android
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxge/android')
-rw-r--r--core/fxge/android/cfpf_skiafont.cpp2
-rw-r--r--core/fxge/android/cfpf_skiafont.h2
-rw-r--r--core/fxge/android/cfpf_skiafontdescriptor.h8
-rw-r--r--core/fxge/android/cfpf_skiafontmgr.cpp8
-rw-r--r--core/fxge/android/cfpf_skiapathfont.h8
-rw-r--r--core/fxge/android/cfx_androidfontinfo.cpp4
-rw-r--r--core/fxge/android/cfx_androidfontinfo.h4
7 files changed, 18 insertions, 18 deletions
diff --git a/core/fxge/android/cfpf_skiafont.cpp b/core/fxge/android/cfpf_skiafont.cpp
index 5e11efae9d..e00aa840e4 100644
--- a/core/fxge/android/cfpf_skiafont.cpp
+++ b/core/fxge/android/cfpf_skiafont.cpp
@@ -53,7 +53,7 @@ CFX_ByteString CFPF_SkiaFont::GetPsName() {
return FXFT_Get_Postscript_Name(m_Face);
}
-int32_t CFPF_SkiaFont::GetGlyphIndex(FX_WCHAR wUnicode) {
+int32_t CFPF_SkiaFont::GetGlyphIndex(wchar_t wUnicode) {
if (!m_Face)
return wUnicode;
if (FXFT_Select_Charmap(m_Face, FXFT_ENCODING_UNICODE))
diff --git a/core/fxge/android/cfpf_skiafont.h b/core/fxge/android/cfpf_skiafont.h
index b72c111177..657ced88f2 100644
--- a/core/fxge/android/cfpf_skiafont.h
+++ b/core/fxge/android/cfpf_skiafont.h
@@ -25,7 +25,7 @@ class CFPF_SkiaFont {
CFX_ByteString GetPsName();
uint32_t GetFontStyle() const { return m_dwStyle; }
uint8_t GetCharset() const { return m_uCharset; }
- int32_t GetGlyphIndex(FX_WCHAR wUnicode);
+ int32_t GetGlyphIndex(wchar_t wUnicode);
int32_t GetGlyphWidth(int32_t iGlyphIndex);
int32_t GetAscent() const;
int32_t GetDescent() const;
diff --git a/core/fxge/android/cfpf_skiafontdescriptor.h b/core/fxge/android/cfpf_skiafontdescriptor.h
index 57b85404ad..56f8a34fa5 100644
--- a/core/fxge/android/cfpf_skiafontdescriptor.h
+++ b/core/fxge/android/cfpf_skiafontdescriptor.h
@@ -23,14 +23,14 @@ class CFPF_SkiaFontDescriptor {
virtual int32_t GetType() const { return FPF_SKIAFONTTYPE_Unknown; }
- void SetFamily(const FX_CHAR* pFamily) {
+ void SetFamily(const char* pFamily) {
FX_Free(m_pFamily);
int32_t iSize = FXSYS_strlen(pFamily);
- m_pFamily = FX_Alloc(FX_CHAR, iSize + 1);
- FXSYS_memcpy(m_pFamily, pFamily, iSize * sizeof(FX_CHAR));
+ m_pFamily = FX_Alloc(char, iSize + 1);
+ FXSYS_memcpy(m_pFamily, pFamily, iSize * sizeof(char));
m_pFamily[iSize] = 0;
}
- FX_CHAR* m_pFamily;
+ char* m_pFamily;
uint32_t m_dwStyle;
int32_t m_iFaceIndex;
uint32_t m_dwCharsets;
diff --git a/core/fxge/android/cfpf_skiafontmgr.cpp b/core/fxge/android/cfpf_skiafontmgr.cpp
index e3511be67a..00d989e55c 100644
--- a/core/fxge/android/cfpf_skiafontmgr.cpp
+++ b/core/fxge/android/cfpf_skiafontmgr.cpp
@@ -87,12 +87,12 @@ uint32_t FPF_SkiaGetSubstFont(uint32_t dwHash,
return 0;
}
-uint32_t FPF_GetHashCode_StringA(const FX_CHAR* pStr, int32_t iLength) {
+uint32_t FPF_GetHashCode_StringA(const char* pStr, int32_t iLength) {
if (!pStr)
return 0;
if (iLength < 0)
iLength = FXSYS_strlen(pStr);
- const FX_CHAR* pStrEnd = pStr + iLength;
+ const char* pStrEnd = pStr + iLength;
uint32_t uHashCode = 0;
while (pStr < pStrEnd)
uHashCode = 31 * uHashCode + FXSYS_tolower(*pStr++);
@@ -160,9 +160,9 @@ uint32_t FPF_SkiaGetCharset(uint8_t uCharset) {
uint32_t FPF_SKIANormalizeFontName(const CFX_ByteStringC& bsfamily) {
uint32_t dwHash = 0;
int32_t iLength = bsfamily.GetLength();
- const FX_CHAR* pBuffer = bsfamily.c_str();
+ const char* pBuffer = bsfamily.c_str();
for (int32_t i = 0; i < iLength; i++) {
- FX_CHAR ch = pBuffer[i];
+ char ch = pBuffer[i];
if (ch == ' ' || ch == '-' || ch == ',')
continue;
dwHash = 31 * dwHash + FXSYS_tolower(ch);
diff --git a/core/fxge/android/cfpf_skiapathfont.h b/core/fxge/android/cfpf_skiapathfont.h
index f1cff2574b..f8ddc6c83a 100644
--- a/core/fxge/android/cfpf_skiapathfont.h
+++ b/core/fxge/android/cfpf_skiapathfont.h
@@ -20,14 +20,14 @@ class CFPF_SkiaPathFont : public CFPF_SkiaFontDescriptor {
// CFPF_SkiaFontDescriptor
int32_t GetType() const override { return FPF_SKIAFONTTYPE_Path; }
- void SetPath(const FX_CHAR* pPath) {
+ void SetPath(const char* pPath) {
FX_Free(m_pPath);
int32_t iSize = FXSYS_strlen(pPath);
- m_pPath = FX_Alloc(FX_CHAR, iSize + 1);
- FXSYS_memcpy(m_pPath, pPath, iSize * sizeof(FX_CHAR));
+ m_pPath = FX_Alloc(char, iSize + 1);
+ FXSYS_memcpy(m_pPath, pPath, iSize * sizeof(char));
m_pPath[iSize] = 0;
}
- FX_CHAR* m_pPath;
+ char* m_pPath;
};
#endif // CORE_FXGE_ANDROID_CFPF_SKIAPATHFONT_H_
diff --git a/core/fxge/android/cfx_androidfontinfo.cpp b/core/fxge/android/cfx_androidfontinfo.cpp
index 03a7ffbd9e..6ab9c6479a 100644
--- a/core/fxge/android/cfx_androidfontinfo.cpp
+++ b/core/fxge/android/cfx_androidfontinfo.cpp
@@ -30,7 +30,7 @@ void* CFX_AndroidFontInfo::MapFont(int weight,
bool bItalic,
int charset,
int pitch_family,
- const FX_CHAR* face,
+ const char* face,
int& iExact) {
if (!m_pFontMgr)
return nullptr;
@@ -50,7 +50,7 @@ void* CFX_AndroidFontInfo::MapFont(int weight,
FPF_MATCHFONT_REPLACEANSI);
}
-void* CFX_AndroidFontInfo::GetFont(const FX_CHAR* face) {
+void* CFX_AndroidFontInfo::GetFont(const char* face) {
return nullptr;
}
diff --git a/core/fxge/android/cfx_androidfontinfo.h b/core/fxge/android/cfx_androidfontinfo.h
index 94e1db88ac..076b956a0c 100644
--- a/core/fxge/android/cfx_androidfontinfo.h
+++ b/core/fxge/android/cfx_androidfontinfo.h
@@ -27,9 +27,9 @@ class CFX_AndroidFontInfo : public IFX_SystemFontInfo {
bool bItalic,
int charset,
int pitch_family,
- const FX_CHAR* face,
+ const char* face,
int& bExact) override;
- void* GetFont(const FX_CHAR* face) override;
+ void* GetFont(const char* face) override;
uint32_t GetFontData(void* hFont,
uint32_t table,
uint8_t* buffer,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 22:16:43 +0000