summaryrefslogtreecommitdiff
path: root/core/fxge/ge
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxge/ge')
-rw-r--r--core/fxge/ge/fx_ge_device.cpp28
-rw-r--r--core/fxge/ge/fx_ge_font.cpp28
-rw-r--r--core/fxge/ge/fx_ge_fontmap.cpp144
-rw-r--r--core/fxge/ge/fx_ge_ps.cpp36
-rw-r--r--core/fxge/ge/fx_ge_text.cpp28
-rw-r--r--core/fxge/ge/fx_text_int.h14
6 files changed, 139 insertions, 139 deletions
diff --git a/core/fxge/ge/fx_ge_device.cpp b/core/fxge/ge/fx_ge_device.cpp
index eefac5c033..d791859b03 100644
--- a/core/fxge/ge/fx_ge_device.cpp
+++ b/core/fxge/ge/fx_ge_device.cpp
@@ -113,8 +113,8 @@ void CFX_RenderDevice::UpdateClipBox() {
FX_BOOL CFX_RenderDevice::DrawPath(const CFX_PathData* pPathData,
const CFX_Matrix* pObject2Device,
const CFX_GraphStateData* pGraphState,
- FX_DWORD fill_color,
- FX_DWORD stroke_color,
+ uint32_t fill_color,
+ uint32_t stroke_color,
int fill_mode,
int alpha_flag,
void* pIccTransform,
@@ -201,7 +201,7 @@ FX_BOOL CFX_RenderDevice::DrawPath(const CFX_PathData* pPathData,
m_pDeviceDriver->GetDriverType())) {
CFX_GraphStateData graphState;
graphState.m_LineWidth = 0.0f;
- FX_DWORD strokecolor = fill_color;
+ uint32_t strokecolor = fill_color;
if (bThin) {
if (FXGETFLAG_COLORTYPE(alpha_flag)) {
FXSETFLAG_ALPHA_STROKE(alpha_flag, fill_alpha >> 2);
@@ -244,8 +244,8 @@ FX_BOOL CFX_RenderDevice::DrawFillStrokePath(
const CFX_PathData* pPathData,
const CFX_Matrix* pObject2Device,
const CFX_GraphStateData* pGraphState,
- FX_DWORD fill_color,
- FX_DWORD stroke_color,
+ uint32_t fill_color,
+ uint32_t stroke_color,
int fill_mode,
int alpha_flag,
void* pIccTransform,
@@ -302,7 +302,7 @@ FX_BOOL CFX_RenderDevice::DrawFillStrokePath(
FX_BOOL CFX_RenderDevice::SetPixel(int x,
int y,
- FX_DWORD color,
+ uint32_t color,
int alpha_flag,
void* pIccTransform) {
if (m_pDeviceDriver->SetPixel(x, y, color, alpha_flag, pIccTransform)) {
@@ -312,7 +312,7 @@ FX_BOOL CFX_RenderDevice::SetPixel(int x,
return FillRect(&rect, color, alpha_flag, pIccTransform);
}
FX_BOOL CFX_RenderDevice::FillRect(const FX_RECT* pRect,
- FX_DWORD fill_color,
+ uint32_t fill_color,
int alpha_flag,
void* pIccTransform,
int blend_type) {
@@ -343,7 +343,7 @@ FX_BOOL CFX_RenderDevice::DrawCosmeticLine(FX_FLOAT x1,
FX_FLOAT y1,
FX_FLOAT x2,
FX_FLOAT y2,
- FX_DWORD color,
+ uint32_t color,
int fill_mode,
int alpha_flag,
void* pIccTransform,
@@ -436,7 +436,7 @@ FX_BOOL CFX_RenderDevice::StretchDIBits(const CFX_DIBSource* pBitmap,
int top,
int dest_width,
int dest_height,
- FX_DWORD flags,
+ uint32_t flags,
void* pIccTransform,
int blend_mode) {
FX_RECT dest_rect(left, top, left + dest_width, top + dest_height);
@@ -452,7 +452,7 @@ FX_BOOL CFX_RenderDevice::StretchDIBits(const CFX_DIBSource* pBitmap,
FX_BOOL CFX_RenderDevice::SetBitMask(const CFX_DIBSource* pBitmap,
int left,
int top,
- FX_DWORD argb,
+ uint32_t argb,
int alpha_flag,
void* pIccTransform) {
FX_RECT src_rect(0, 0, pBitmap->GetWidth(), pBitmap->GetHeight());
@@ -465,8 +465,8 @@ FX_BOOL CFX_RenderDevice::StretchBitMask(const CFX_DIBSource* pBitmap,
int top,
int dest_width,
int dest_height,
- FX_DWORD argb,
- FX_DWORD flags,
+ uint32_t argb,
+ uint32_t flags,
int alpha_flag,
void* pIccTransform) {
FX_RECT dest_rect(left, top, left + dest_width, top + dest_height);
@@ -478,9 +478,9 @@ FX_BOOL CFX_RenderDevice::StretchBitMask(const CFX_DIBSource* pBitmap,
}
FX_BOOL CFX_RenderDevice::StartDIBits(const CFX_DIBSource* pBitmap,
int bitmap_alpha,
- FX_DWORD argb,
+ uint32_t argb,
const CFX_Matrix* pMatrix,
- FX_DWORD flags,
+ uint32_t flags,
void*& handle,
int alpha_flag,
void* pIccTransform,
diff --git a/core/fxge/ge/fx_ge_font.cpp b/core/fxge/ge/fx_ge_font.cpp
index b2c92f516d..04019a059c 100644
--- a/core/fxge/ge/fx_ge_font.cpp
+++ b/core/fxge/ge/fx_ge_font.cpp
@@ -13,7 +13,7 @@
namespace {
#ifdef PDF_ENABLE_XFA
-const FX_DWORD g_EncodingID[] = {
+const uint32_t g_EncodingID[] = {
FXFM_ENCODING_MS_SYMBOL, FXFM_ENCODING_UNICODE,
FXFM_ENCODING_MS_SJIS, FXFM_ENCODING_MS_GB2312,
FXFM_ENCODING_MS_BIG5, FXFM_ENCODING_MS_WANSUNG,
@@ -24,7 +24,7 @@ const FX_DWORD g_EncodingID[] = {
};
CFX_UnicodeEncodingEx* _FXFM_CreateFontEncoding(CFX_Font* pFont,
- FX_DWORD nEncodingID) {
+ uint32_t nEncodingID) {
if (FXFT_Select_Charmap(pFont->GetFace(), nEncodingID))
return nullptr;
return new CFX_UnicodeEncodingEx(pFont, nEncodingID);
@@ -127,7 +127,7 @@ void CFX_Font::DeleteFace() {
}
void CFX_Font::LoadSubst(const CFX_ByteString& face_name,
FX_BOOL bTrueType,
- FX_DWORD flags,
+ uint32_t flags,
int weight,
int italic_angle,
int CharsetCP,
@@ -213,7 +213,7 @@ FX_BOOL CFX_Font::LoadFile(IFX_FileRead* pFile,
}
#endif // PDF_ENABLE_XFA
-int CFX_Font::GetGlyphWidth(FX_DWORD glyph_index) {
+int CFX_Font::GetGlyphWidth(uint32_t glyph_index) {
if (!m_Face) {
return 0;
}
@@ -231,7 +231,7 @@ int CFX_Font::GetGlyphWidth(FX_DWORD glyph_index) {
return width;
}
-FX_BOOL CFX_Font::LoadEmbedded(const uint8_t* data, FX_DWORD size) {
+FX_BOOL CFX_Font::LoadEmbedded(const uint8_t* data, uint32_t size) {
m_pFontDataAllocation = FX_Alloc(uint8_t, size);
FXSYS_memcpy(m_pFontDataAllocation, data, size);
m_Face = FT_LoadFont(m_pFontDataAllocation, size);
@@ -261,7 +261,7 @@ int CFX_Font::GetDescent() const {
FXFT_Get_Face_Descender(m_Face));
}
-FX_BOOL CFX_Font::GetGlyphBBox(FX_DWORD glyph_index, FX_RECT& bbox) {
+FX_BOOL CFX_Font::GetGlyphBBox(uint32_t glyph_index, FX_RECT& bbox) {
if (!m_Face)
return FALSE;
@@ -448,7 +448,7 @@ CFX_UnicodeEncoding::CFX_UnicodeEncoding(CFX_Font* pFont) : m_pFont(pFont) {}
CFX_UnicodeEncoding::~CFX_UnicodeEncoding() {}
-FX_DWORD CFX_UnicodeEncoding::GlyphFromCharCode(FX_DWORD charcode) {
+uint32_t CFX_UnicodeEncoding::GlyphFromCharCode(uint32_t charcode) {
FXFT_Face face = m_pFont->GetFace();
if (!face)
return charcode;
@@ -457,7 +457,7 @@ FX_DWORD CFX_UnicodeEncoding::GlyphFromCharCode(FX_DWORD charcode) {
return FXFT_Get_Char_Index(face, charcode);
if (m_pFont->GetSubstFont() && m_pFont->GetSubstFont()->m_Charset == 2) {
- FX_DWORD index = 0;
+ uint32_t index = 0;
if (FXFT_Select_Charmap(face, FXFT_ENCODING_MS_SYMBOL) == 0)
index = FXFT_Get_Char_Index(face, charcode);
if (!index && !FXFT_Select_Charmap(face, FXFT_ENCODING_APPLE_ROMAN))
@@ -468,12 +468,12 @@ FX_DWORD CFX_UnicodeEncoding::GlyphFromCharCode(FX_DWORD charcode) {
#ifdef PDF_ENABLE_XFA
CFX_UnicodeEncodingEx::CFX_UnicodeEncodingEx(CFX_Font* pFont,
- FX_DWORD EncodingID)
+ uint32_t EncodingID)
: CFX_UnicodeEncoding(pFont), m_nEncodingID(EncodingID) {}
CFX_UnicodeEncodingEx::~CFX_UnicodeEncodingEx() {}
-FX_DWORD CFX_UnicodeEncodingEx::GlyphFromCharCode(FX_DWORD charcode) {
+uint32_t CFX_UnicodeEncodingEx::GlyphFromCharCode(uint32_t charcode) {
FXFT_Face face = m_pFont->GetFace();
FT_UInt nIndex = FXFT_Get_Char_Index(face, charcode);
if (nIndex > 0) {
@@ -482,7 +482,7 @@ FX_DWORD CFX_UnicodeEncodingEx::GlyphFromCharCode(FX_DWORD charcode) {
int nmaps = FXFT_Get_Face_CharmapCount(face);
int m = 0;
while (m < nmaps) {
- FX_DWORD nEncodingID =
+ uint32_t nEncodingID =
FXFT_Get_Charmap_Encoding(FXFT_Get_Face_Charmaps(face)[m++]);
if (m_nEncodingID == nEncodingID) {
continue;
@@ -501,7 +501,7 @@ FX_DWORD CFX_UnicodeEncodingEx::GlyphFromCharCode(FX_DWORD charcode) {
return 0;
}
-FX_DWORD CFX_UnicodeEncodingEx::CharCodeFromUnicode(FX_WCHAR Unicode) const {
+uint32_t CFX_UnicodeEncodingEx::CharCodeFromUnicode(FX_WCHAR Unicode) const {
if (m_nEncodingID == FXFM_ENCODING_UNICODE ||
m_nEncodingID == FXFM_ENCODING_MS_SYMBOL) {
return Unicode;
@@ -516,11 +516,11 @@ FX_DWORD CFX_UnicodeEncodingEx::CharCodeFromUnicode(FX_WCHAR Unicode) const {
return Unicode;
}
}
- return static_cast<FX_DWORD>(-1);
+ return static_cast<uint32_t>(-1);
}
CFX_UnicodeEncodingEx* FX_CreateFontEncodingEx(CFX_Font* pFont,
- FX_DWORD nEncodingID) {
+ uint32_t nEncodingID) {
if (!pFont || !pFont->GetFace())
return nullptr;
diff --git a/core/fxge/ge/fx_ge_fontmap.cpp b/core/fxge/ge/fx_ge_fontmap.cpp
index 27b82f5803..709ef0031b 100644
--- a/core/fxge/ge/fx_ge_fontmap.cpp
+++ b/core/fxge/ge/fx_ge_fontmap.cpp
@@ -16,7 +16,7 @@
#define GET_TT_SHORT(w) (uint16_t)(((w)[0] << 8) | (w)[1])
#define GET_TT_LONG(w) \
- (FX_DWORD)(((w)[0] << 24) | ((w)[1] << 16) | ((w)[2] << 8) | (w)[3])
+ (uint32_t)(((w)[0] << 24) | ((w)[1] << 16) | ((w)[2] << 8) | (w)[3])
#define FX_FONT_STYLE_None 0x00
#define FX_FONT_STYLE_Bold 0x01
@@ -27,7 +27,7 @@ namespace {
struct BuiltinFont {
const uint8_t* m_pFontData;
- FX_DWORD m_dwSize;
+ uint32_t m_dwSize;
};
const BuiltinFont g_FoxitFonts[14] = {
@@ -211,8 +211,8 @@ const struct CODEPAGE_MAP {
{10081, 86},
};
-const FX_DWORD kTableNAME = FXDWORD_GET_MSBFIRST("name");
-const FX_DWORD kTableTTCF = FXDWORD_GET_MSBFIRST("ttcf");
+const uint32_t kTableNAME = FXDWORD_GET_MSBFIRST("name");
+const uint32_t kTableTTCF = FXDWORD_GET_MSBFIRST("ttcf");
int CompareFontFamilyString(const void* key, const void* element) {
CFX_ByteString str_key((const FX_CHAR*)key);
@@ -237,7 +237,7 @@ CFX_ByteString KeyNameFromFace(const CFX_ByteString& face_name,
return key;
}
-CFX_ByteString KeyNameFromSize(int ttc_size, FX_DWORD checksum) {
+CFX_ByteString KeyNameFromSize(int ttc_size, uint32_t checksum) {
CFX_ByteString key;
key.Format("%d:%d", ttc_size, checksum);
return key;
@@ -256,7 +256,7 @@ CFX_ByteString TT_NormalizeName(const FX_CHAR* family) {
return norm;
}
-CFX_ByteString FPDF_ReadStringFromFile(FXSYS_FILE* pFile, FX_DWORD size) {
+CFX_ByteString FPDF_ReadStringFromFile(FXSYS_FILE* pFile, uint32_t size) {
CFX_ByteString buffer;
if (!FXSYS_fread(buffer.GetBuffer(size), size, 1, pFile)) {
return CFX_ByteString();
@@ -267,13 +267,13 @@ CFX_ByteString FPDF_ReadStringFromFile(FXSYS_FILE* pFile, FX_DWORD size) {
CFX_ByteString FPDF_LoadTableFromTT(FXSYS_FILE* pFile,
const uint8_t* pTables,
- FX_DWORD nTables,
- FX_DWORD tag) {
- for (FX_DWORD i = 0; i < nTables; i++) {
+ uint32_t nTables,
+ uint32_t tag) {
+ for (uint32_t i = 0; i < nTables; i++) {
const uint8_t* p = pTables + i * 16;
if (GET_TT_LONG(p) == tag) {
- FX_DWORD offset = GET_TT_LONG(p + 8);
- FX_DWORD size = GET_TT_LONG(p + 12);
+ uint32_t offset = GET_TT_LONG(p + 8);
+ uint32_t size = GET_TT_LONG(p + 12);
FXSYS_fseek(pFile, offset, FXSYS_SEEK_SET);
return FPDF_ReadStringFromFile(pFile, size);
}
@@ -362,7 +362,7 @@ FX_BOOL CheckSupportThirdPartFont(CFX_ByteString name, int& PitchFamily) {
return FALSE;
}
-FX_DWORD GetCharset(int charset) {
+uint32_t GetCharset(int charset) {
switch (charset) {
case FXFONT_SHIFTJIS_CHARSET:
return CHARSET_FLAG_SHIFTJIS;
@@ -385,7 +385,7 @@ FX_DWORD GetCharset(int charset) {
int32_t GetSimilarValue(int weight,
FX_BOOL bItalic,
int pitch_family,
- FX_DWORD style) {
+ uint32_t style) {
int32_t iSimilarValue = 0;
if (!!(style & FXFONT_BOLD) == (weight > 400)) {
iSimilarValue += 16;
@@ -480,7 +480,7 @@ void CFX_FontMgr::SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo) {
FXFT_Face CFX_FontMgr::FindSubstFont(const CFX_ByteString& face_name,
FX_BOOL bTrueType,
- FX_DWORD flags,
+ uint32_t flags,
int weight,
int italic_angle,
int CharsetCP,
@@ -507,7 +507,7 @@ FXFT_Face CFX_FontMgr::AddCachedFace(const CFX_ByteString& face_name,
int weight,
FX_BOOL bItalic,
uint8_t* pData,
- FX_DWORD size,
+ uint32_t size,
int face_index) {
CTTFontDesc* pFontDesc = new CTTFontDesc;
pFontDesc->m_Type = 1;
@@ -535,12 +535,12 @@ FXFT_Face CFX_FontMgr::AddCachedFace(const CFX_ByteString& face_name,
}
int GetTTCIndex(const uint8_t* pFontData,
- FX_DWORD ttc_size,
- FX_DWORD font_offset) {
+ uint32_t ttc_size,
+ uint32_t font_offset) {
int face_index = 0;
const uint8_t* p = pFontData + 8;
- FX_DWORD nfont = GET_TT_LONG(p);
- FX_DWORD index;
+ uint32_t nfont = GET_TT_LONG(p);
+ uint32_t index;
for (index = 0; index < nfont; index++) {
p = pFontData + 12 + index * 4;
if (GET_TT_LONG(p) == font_offset) {
@@ -555,7 +555,7 @@ int GetTTCIndex(const uint8_t* pFontData,
return face_index;
}
FXFT_Face CFX_FontMgr::GetCachedTTCFace(int ttc_size,
- FX_DWORD checksum,
+ uint32_t checksum,
int font_offset,
uint8_t*& pFontData) {
auto it = m_FaceMap.find(KeyNameFromSize(ttc_size, checksum));
@@ -573,9 +573,9 @@ FXFT_Face CFX_FontMgr::GetCachedTTCFace(int ttc_size,
return pFontDesc->m_TTCFace.m_pFaces[face_index];
}
FXFT_Face CFX_FontMgr::AddCachedTTCFace(int ttc_size,
- FX_DWORD checksum,
+ uint32_t checksum,
uint8_t* pData,
- FX_DWORD size,
+ uint32_t size,
int font_offset) {
CTTFontDesc* pFontDesc = new CTTFontDesc;
pFontDesc->m_Type = 2;
@@ -592,7 +592,7 @@ FXFT_Face CFX_FontMgr::AddCachedTTCFace(int ttc_size,
}
FXFT_Face CFX_FontMgr::GetFixedFace(const uint8_t* pData,
- FX_DWORD size,
+ uint32_t size,
int face_index) {
InitFTLibrary();
FXFT_Library library = m_FTLibrary;
@@ -633,7 +633,7 @@ void CFX_FontMgr::ReleaseFace(FXFT_Face face) {
bool CFX_FontMgr::GetBuiltinFont(size_t index,
const uint8_t** pFontData,
- FX_DWORD* size) {
+ uint32_t* size) {
if (index < FX_ArraySize(g_FoxitFonts)) {
*pFontData = g_FoxitFonts[index].m_pFontData;
*size = g_FoxitFonts[index].m_dwSize;
@@ -682,7 +682,7 @@ void CFX_FontMapper::SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo) {
m_pFontInfo = pFontInfo;
}
static CFX_ByteString GetStringFromTable(const uint8_t* string_ptr,
- FX_DWORD string_ptr_length,
+ uint32_t string_ptr_length,
uint16_t offset,
uint16_t length) {
if (string_ptr_length < offset + length) {
@@ -691,13 +691,13 @@ static CFX_ByteString GetStringFromTable(const uint8_t* string_ptr,
return CFX_ByteStringC(string_ptr + offset, length);
}
CFX_ByteString GetNameFromTT(const uint8_t* name_table,
- FX_DWORD name_table_size,
- FX_DWORD name_id) {
+ uint32_t name_table_size,
+ uint32_t name_id) {
if (!name_table || name_table_size < 6) {
return CFX_ByteString();
}
- FX_DWORD name_count = GET_TT_SHORT(name_table + 2);
- FX_DWORD string_offset = GET_TT_SHORT(name_table + 4);
+ uint32_t name_count = GET_TT_SHORT(name_table + 2);
+ uint32_t string_offset = GET_TT_SHORT(name_table + 4);
// We will ignore the possibility of overlap of structures and
// string table as if it's all corrupt there's not a lot we can do.
if (name_table_size < string_offset) {
@@ -705,14 +705,14 @@ CFX_ByteString GetNameFromTT(const uint8_t* name_table,
}
const uint8_t* string_ptr = name_table + string_offset;
- FX_DWORD string_ptr_size = name_table_size - string_offset;
+ uint32_t string_ptr_size = name_table_size - string_offset;
name_table += 6;
name_table_size -= 6;
if (name_table_size < name_count * 12) {
return CFX_ByteString();
}
- for (FX_DWORD i = 0; i < name_count; i++, name_table += 12) {
+ for (uint32_t i = 0; i < name_count; i++, name_table += 12) {
if (GET_TT_SHORT(name_table + 6) == name_id &&
GET_TT_SHORT(name_table) == 1 && GET_TT_SHORT(name_table + 2) == 0) {
return GetStringFromTable(string_ptr, string_ptr_size,
@@ -727,13 +727,13 @@ CFX_ByteString CFX_FontMapper::GetPSNameFromTT(void* hFont) {
if (!m_pFontInfo)
return CFX_ByteString();
- FX_DWORD size = m_pFontInfo->GetFontData(hFont, kTableNAME, nullptr, 0);
+ uint32_t size = m_pFontInfo->GetFontData(hFont, kTableNAME, nullptr, 0);
if (!size)
return CFX_ByteString();
std::vector<uint8_t> buffer(size);
uint8_t* buffer_ptr = buffer.data();
- FX_DWORD bytes_read =
+ uint32_t bytes_read =
m_pFontInfo->GetFontData(hFont, kTableNAME, buffer_ptr, size);
return bytes_read == size ? GetNameFromTT(buffer_ptr, bytes_read, 6)
: CFX_ByteString();
@@ -743,8 +743,8 @@ void CFX_FontMapper::AddInstalledFont(const CFX_ByteString& name, int charset) {
if (!m_pFontInfo) {
return;
}
- if (m_CharsetArray.Find((FX_DWORD)charset) == -1) {
- m_CharsetArray.Add((FX_DWORD)charset);
+ if (m_CharsetArray.Find((uint32_t)charset) == -1) {
+ m_CharsetArray.Add((uint32_t)charset);
m_FaceArray.push_back(name);
}
if (name == m_LastFamily) {
@@ -820,7 +820,7 @@ FXFT_Face CFX_FontMapper::UseInternalSubst(CFX_SubstFont* pSubstFont,
return m_FoxitFaces[iBaseFont];
}
const uint8_t* pFontData = NULL;
- FX_DWORD size = 0;
+ uint32_t size = 0;
if (m_pFontMgr->GetBuiltinFont(iBaseFont, &pFontData, &size)) {
m_FoxitFaces[iBaseFont] = m_pFontMgr->GetFixedFace(pFontData, size, 0);
return m_FoxitFaces[iBaseFont];
@@ -838,7 +838,7 @@ FXFT_Face CFX_FontMapper::UseInternalSubst(CFX_SubstFont* pSubstFont,
return m_MMFaces[1];
}
const uint8_t* pFontData = NULL;
- FX_DWORD size = 0;
+ uint32_t size = 0;
m_pFontMgr->GetBuiltinFont(14, &pFontData, &size);
m_MMFaces[1] = m_pFontMgr->GetFixedFace(pFontData, size, 0);
return m_MMFaces[1];
@@ -848,7 +848,7 @@ FXFT_Face CFX_FontMapper::UseInternalSubst(CFX_SubstFont* pSubstFont,
return m_MMFaces[0];
}
const uint8_t* pFontData = NULL;
- FX_DWORD size = 0;
+ uint32_t size = 0;
m_pFontMgr->GetBuiltinFont(15, &pFontData, &size);
m_MMFaces[0] = m_pFontMgr->GetFixedFace(pFontData, size, 0);
return m_MMFaces[0];
@@ -856,7 +856,7 @@ FXFT_Face CFX_FontMapper::UseInternalSubst(CFX_SubstFont* pSubstFont,
FXFT_Face CFX_FontMapper::FindSubstFont(const CFX_ByteString& name,
FX_BOOL bTrueType,
- FX_DWORD flags,
+ uint32_t flags,
int weight,
int italic_angle,
int WindowCP,
@@ -881,7 +881,7 @@ FXFT_Face CFX_FontMapper::FindSubstFont(const CFX_ByteString& name,
return m_FoxitFaces[12];
}
const uint8_t* pFontData = NULL;
- FX_DWORD size = 0;
+ uint32_t size = 0;
m_pFontMgr->GetBuiltinFont(12, &pFontData, &size);
m_FoxitFaces[12] = m_pFontMgr->GetFixedFace(pFontData, size, 0);
return m_FoxitFaces[12];
@@ -894,7 +894,7 @@ FXFT_Face CFX_FontMapper::FindSubstFont(const CFX_ByteString& name,
return m_FoxitFaces[13];
}
const uint8_t* pFontData = NULL;
- FX_DWORD size = 0;
+ uint32_t size = 0;
m_pFontMgr->GetBuiltinFont(13, &pFontData, &size);
m_FoxitFaces[13] = m_pFontMgr->GetFixedFace(pFontData, size, 0);
return m_FoxitFaces[13];
@@ -918,7 +918,7 @@ FXFT_Face CFX_FontMapper::FindSubstFont(const CFX_ByteString& name,
}
int PitchFamily = 0;
FX_BOOL bItalic = FALSE;
- FX_DWORD nStyle = 0;
+ uint32_t nStyle = 0;
FX_BOOL bStyleAvail = FALSE;
if (iBaseFont < 12) {
family = g_Base14FontNames[iBaseFont];
@@ -1139,7 +1139,7 @@ FXFT_Face CFX_FontMapper::FindSubstFont(const CFX_ByteString& name,
return m_FoxitFaces[12];
}
const uint8_t* pFontData = NULL;
- FX_DWORD size = 0;
+ uint32_t size = 0;
m_pFontMgr->GetBuiltinFont(12, &pFontData, &size);
m_FoxitFaces[12] = m_pFontMgr->GetFixedFace(pFontData, size, 0);
return m_FoxitFaces[12];
@@ -1170,8 +1170,8 @@ FXFT_Face CFX_FontMapper::FindSubstFont(const CFX_ByteString& name,
if (Charset == FXFONT_DEFAULT_CHARSET) {
m_pFontInfo->GetFontCharset(hFont, Charset);
}
- FX_DWORD ttc_size = m_pFontInfo->GetFontData(hFont, kTableTTCF, nullptr, 0);
- FX_DWORD font_size = m_pFontInfo->GetFontData(hFont, 0, nullptr, 0);
+ uint32_t ttc_size = m_pFontInfo->GetFontData(hFont, kTableTTCF, nullptr, 0);
+ uint32_t font_size = m_pFontInfo->GetFontData(hFont, 0, nullptr, 0);
if (font_size == 0 && ttc_size == 0) {
m_pFontInfo->DeleteFont(hFont);
return nullptr;
@@ -1180,9 +1180,9 @@ FXFT_Face CFX_FontMapper::FindSubstFont(const CFX_ByteString& name,
if (ttc_size) {
uint8_t temp[1024];
m_pFontInfo->GetFontData(hFont, kTableTTCF, temp, 1024);
- FX_DWORD checksum = 0;
+ uint32_t checksum = 0;
for (int i = 0; i < 256; i++) {
- checksum += ((FX_DWORD*)temp)[i];
+ checksum += ((uint32_t*)temp)[i];
}
uint8_t* pFontData;
face = m_pFontMgr->GetCachedTTCFace(ttc_size, checksum,
@@ -1239,8 +1239,8 @@ FXFT_Face CFX_FontMapper::FindSubstFont(const CFX_ByteString& name,
return face;
}
#ifdef PDF_ENABLE_XFA
-FXFT_Face CFX_FontMapper::FindSubstFontByUnicode(FX_DWORD dwUnicode,
- FX_DWORD flags,
+FXFT_Face CFX_FontMapper::FindSubstFontByUnicode(uint32_t dwUnicode,
+ uint32_t flags,
int weight,
int italic_angle) {
if (m_pFontInfo == NULL) {
@@ -1262,8 +1262,8 @@ FXFT_Face CFX_FontMapper::FindSubstFontByUnicode(FX_DWORD dwUnicode,
if (hFont == NULL) {
return NULL;
}
- FX_DWORD ttc_size = m_pFontInfo->GetFontData(hFont, 0x74746366, NULL, 0);
- FX_DWORD font_size = m_pFontInfo->GetFontData(hFont, 0, NULL, 0);
+ uint32_t ttc_size = m_pFontInfo->GetFontData(hFont, 0x74746366, NULL, 0);
+ uint32_t font_size = m_pFontInfo->GetFontData(hFont, 0, NULL, 0);
if (font_size == 0 && ttc_size == 0) {
m_pFontInfo->DeleteFont(hFont);
return NULL;
@@ -1272,9 +1272,9 @@ FXFT_Face CFX_FontMapper::FindSubstFontByUnicode(FX_DWORD dwUnicode,
if (ttc_size) {
uint8_t temp[1024];
m_pFontInfo->GetFontData(hFont, 0x74746366, temp, 1024);
- FX_DWORD checksum = 0;
+ uint32_t checksum = 0;
for (int i = 0; i < 256; i++) {
- checksum += ((FX_DWORD*)temp)[i];
+ checksum += ((uint32_t*)temp)[i];
}
uint8_t* pFontData;
face = m_pFontMgr->GetCachedTTCFace(ttc_size, checksum,
@@ -1308,7 +1308,7 @@ FXFT_Face CFX_FontMapper::FindSubstFontByUnicode(FX_DWORD dwUnicode,
return face;
}
-void* IFX_SystemFontInfo::MapFontByUnicode(FX_DWORD dwUnicode,
+void* IFX_SystemFontInfo::MapFontByUnicode(uint32_t dwUnicode,
int weight,
FX_BOOL bItalic,
int pitch_family) {
@@ -1415,7 +1415,7 @@ void CFX_FolderFontInfo::ScanFile(const CFX_ByteString& path) {
return;
}
FXSYS_fseek(pFile, 0, FXSYS_SEEK_END);
- FX_DWORD filesize = FXSYS_ftell(pFile);
+ uint32_t filesize = FXSYS_ftell(pFile);
uint8_t buffer[16];
FXSYS_fseek(pFile, 0, FXSYS_SEEK_SET);
size_t readCnt = FXSYS_fread(buffer, 12, 1, pFile);
@@ -1425,12 +1425,12 @@ void CFX_FolderFontInfo::ScanFile(const CFX_ByteString& path) {
}
if (GET_TT_LONG(buffer) == kTableTTCF) {
- FX_DWORD nFaces = GET_TT_LONG(buffer + 8);
- if (nFaces > std::numeric_limits<FX_DWORD>::max() / 4) {
+ uint32_t nFaces = GET_TT_LONG(buffer + 8);
+ if (nFaces > std::numeric_limits<uint32_t>::max() / 4) {
FXSYS_fclose(pFile);
return;
}
- FX_DWORD face_bytes = nFaces * 4;
+ uint32_t face_bytes = nFaces * 4;
uint8_t* offsets = FX_Alloc(uint8_t, face_bytes);
readCnt = FXSYS_fread(offsets, 1, face_bytes, pFile);
if (readCnt != face_bytes) {
@@ -1438,7 +1438,7 @@ void CFX_FolderFontInfo::ScanFile(const CFX_ByteString& path) {
FXSYS_fclose(pFile);
return;
}
- for (FX_DWORD i = 0; i < nFaces; i++) {
+ for (uint32_t i = 0; i < nFaces; i++) {
uint8_t* p = offsets + i * 4;
ReportFace(path, pFile, filesize, GET_TT_LONG(p));
}
@@ -1450,14 +1450,14 @@ void CFX_FolderFontInfo::ScanFile(const CFX_ByteString& path) {
}
void CFX_FolderFontInfo::ReportFace(const CFX_ByteString& path,
FXSYS_FILE* pFile,
- FX_DWORD filesize,
- FX_DWORD offset) {
+ uint32_t filesize,
+ uint32_t offset) {
FXSYS_fseek(pFile, offset, FXSYS_SEEK_SET);
char buffer[16];
if (!FXSYS_fread(buffer, 12, 1, pFile)) {
return;
}
- FX_DWORD nTables = GET_TT_SHORT(buffer + 4);
+ uint32_t nTables = GET_TT_SHORT(buffer + 4);
CFX_ByteString tables = FPDF_ReadStringFromFile(pFile, nTables * 16);
if (tables.IsEmpty()) {
return;
@@ -1483,7 +1483,7 @@ void CFX_FolderFontInfo::ReportFace(const CFX_ByteString& path,
CFX_ByteString os2 = FPDF_LoadTableFromTT(pFile, tables, nTables, 0x4f532f32);
if (os2.GetLength() >= 86) {
const uint8_t* p = (const uint8_t*)os2 + 78;
- FX_DWORD codepages = GET_TT_LONG(p);
+ uint32_t codepages = GET_TT_LONG(p);
if (codepages & (1 << 17)) {
m_pMapper->AddInstalledFont(facename, FXFONT_SHIFTJIS_CHARSET);
pInfo->m_Charsets |= CHARSET_FLAG_SHIFTJIS;
@@ -1540,7 +1540,7 @@ void* CFX_FolderFontInfo::FindFont(int weight,
if (charset == FXFONT_ANSI_CHARSET && (pitch_family & FXFONT_FF_FIXEDPITCH)) {
return GetFont("Courier New");
}
- FX_DWORD charset_flag = GetCharset(charset);
+ uint32_t charset_flag = GetCharset(charset);
int32_t iBestSimilar = 0;
for (const auto& it : m_FontList) {
const CFX_ByteString& bsName = it.first;
@@ -1572,7 +1572,7 @@ void* CFX_FolderFontInfo::MapFont(int weight,
}
#ifdef PDF_ENABLE_XFA
-void* CFX_FolderFontInfo::MapFontByUnicode(FX_DWORD dwUnicode,
+void* CFX_FolderFontInfo::MapFontByUnicode(uint32_t dwUnicode,
int weight,
FX_BOOL bItalic,
int pitch_family) {
@@ -1585,23 +1585,23 @@ void* CFX_FolderFontInfo::GetFont(const FX_CHAR* face) {
return it != m_FontList.end() ? it->second : nullptr;
}
-FX_DWORD CFX_FolderFontInfo::GetFontData(void* hFont,
- FX_DWORD table,
+uint32_t CFX_FolderFontInfo::GetFontData(void* hFont,
+ uint32_t table,
uint8_t* buffer,
- FX_DWORD size) {
+ uint32_t size) {
if (!hFont)
return 0;
const CFX_FontFaceInfo* pFont = static_cast<CFX_FontFaceInfo*>(hFont);
- FX_DWORD datasize = 0;
- FX_DWORD offset = 0;
+ uint32_t datasize = 0;
+ uint32_t offset = 0;
if (table == 0) {
datasize = pFont->m_FontOffset ? 0 : pFont->m_FileSize;
} else if (table == kTableTTCF) {
datasize = pFont->m_FontOffset ? pFont->m_FileSize : 0;
} else {
- FX_DWORD nTables = pFont->m_FontTables.GetLength() / 16;
- for (FX_DWORD i = 0; i < nTables; i++) {
+ uint32_t nTables = pFont->m_FontTables.GetLength() / 16;
+ for (uint32_t i = 0; i < nTables; i++) {
const uint8_t* p =
static_cast<const uint8_t*>(pFont->m_FontTables) + i * 16;
if (GET_TT_LONG(p) == table) {
diff --git a/core/fxge/ge/fx_ge_ps.cpp b/core/fxge/ge/fx_ge_ps.cpp
index 2470025852..32f2fce914 100644
--- a/core/fxge/ge/fx_ge_ps.cpp
+++ b/core/fxge/ge/fx_ge_ps.cpp
@@ -11,7 +11,7 @@
struct PSGlyph {
CFX_Font* m_pFont;
- FX_DWORD m_GlyphIndex;
+ uint32_t m_GlyphIndex;
FX_BOOL m_bGlyphAdjust;
FX_FLOAT m_AdjustMatrix[4];
};
@@ -178,8 +178,8 @@ void CFX_PSRenderer::SetClip_PathStroke(const CFX_PathData* pPathData,
FX_BOOL CFX_PSRenderer::DrawPath(const CFX_PathData* pPathData,
const CFX_Matrix* pObject2Device,
const CFX_GraphStateData* pGraphState,
- FX_DWORD fill_color,
- FX_DWORD stroke_color,
+ uint32_t fill_color,
+ uint32_t stroke_color,
int fill_mode,
int alpha_flag,
void* pIccTransform) {
@@ -275,7 +275,7 @@ static void FaxCompressData(uint8_t* src_buf,
int width,
int height,
uint8_t*& dest_buf,
- FX_DWORD& dest_size) {
+ uint32_t& dest_size) {
CCodec_ModuleMgr* pEncoders = CFX_GEModule::Get()->GetCodecModule();
if (width * height > 128 && pEncoders &&
pEncoders->GetFaxModule()->Encode(src_buf, width, height, (width + 7) / 8,
@@ -288,9 +288,9 @@ static void FaxCompressData(uint8_t* src_buf,
}
static void PSCompressData(int PSLevel,
uint8_t* src_buf,
- FX_DWORD src_size,
+ uint32_t src_size,
uint8_t*& output_buf,
- FX_DWORD& output_size,
+ uint32_t& output_size,
const FX_CHAR*& filter) {
output_buf = src_buf;
output_size = src_size;
@@ -300,7 +300,7 @@ static void PSCompressData(int PSLevel,
}
CCodec_ModuleMgr* pEncoders = CFX_GEModule::Get()->GetCodecModule();
uint8_t* dest_buf = NULL;
- FX_DWORD dest_size = src_size;
+ uint32_t dest_size = src_size;
if (PSLevel >= 3) {
if (pEncoders &&
pEncoders->GetFlateModule()->Encode(src_buf, src_size, dest_buf,
@@ -323,7 +323,7 @@ static void PSCompressData(int PSLevel,
}
}
FX_BOOL CFX_PSRenderer::SetDIBits(const CFX_DIBSource* pSource,
- FX_DWORD color,
+ uint32_t color,
int left,
int top,
int alpha_flag,
@@ -335,12 +335,12 @@ FX_BOOL CFX_PSRenderer::SetDIBits(const CFX_DIBSource* pSource,
return DrawDIBits(pSource, color, &matrix, 0, alpha_flag, pIccTransform);
}
FX_BOOL CFX_PSRenderer::StretchDIBits(const CFX_DIBSource* pSource,
- FX_DWORD color,
+ uint32_t color,
int dest_left,
int dest_top,
int dest_width,
int dest_height,
- FX_DWORD flags,
+ uint32_t flags,
int alpha_flag,
void* pIccTransform) {
StartRendering();
@@ -350,9 +350,9 @@ FX_BOOL CFX_PSRenderer::StretchDIBits(const CFX_DIBSource* pSource,
return DrawDIBits(pSource, color, &matrix, flags, alpha_flag, pIccTransform);
}
FX_BOOL CFX_PSRenderer::DrawDIBits(const CFX_DIBSource* pSource,
- FX_DWORD color,
+ uint32_t color,
const CFX_Matrix* pMatrix,
- FX_DWORD flags,
+ uint32_t flags,
int alpha_flag,
void* pIccTransform) {
StartRendering();
@@ -377,14 +377,14 @@ FX_BOOL CFX_PSRenderer::DrawDIBits(const CFX_DIBSource* pSource,
buf << width << " " << height;
if (pSource->GetBPP() == 1 && !pSource->GetPalette()) {
int pitch = (width + 7) / 8;
- FX_DWORD src_size = height * pitch;
+ uint32_t src_size = height * pitch;
uint8_t* src_buf = FX_Alloc(uint8_t, src_size);
for (int row = 0; row < height; row++) {
const uint8_t* src_scan = pSource->GetScanline(row);
FXSYS_memcpy(src_buf + row * pitch, src_scan, pitch);
}
uint8_t* output_buf;
- FX_DWORD output_size;
+ uint32_t output_size;
FaxCompressData(src_buf, width, height, output_buf, output_size);
if (pSource->IsAlphaMask()) {
SetColor(color, alpha_flag, pIccTransform);
@@ -469,7 +469,7 @@ FX_BOOL CFX_PSRenderer::DrawDIBits(const CFX_DIBSource* pSource,
}
}
uint8_t* compressed_buf;
- FX_DWORD compressed_size;
+ uint32_t compressed_size;
PSCompressData(m_PSLevel, output_buf, output_size, compressed_buf,
compressed_size, filter);
if (output_buf != compressed_buf) {
@@ -497,7 +497,7 @@ FX_BOOL CFX_PSRenderer::DrawDIBits(const CFX_DIBSource* pSource,
OUTPUT_PS("\nQ\n");
return TRUE;
}
-void CFX_PSRenderer::SetColor(FX_DWORD color,
+void CFX_PSRenderer::SetColor(uint32_t color,
int alpha_flag,
void* pIccTransform) {
if (!CFX_GEModule::Get()->GetCodecModule() ||
@@ -646,7 +646,7 @@ FX_BOOL CFX_PSRenderer::DrawText(int nChars,
CFX_FontCache* pCache,
const CFX_Matrix* pObject2Device,
FX_FLOAT font_size,
- FX_DWORD color,
+ uint32_t color,
int alpha_flag,
void* pIccTransform) {
StartRendering();
@@ -688,7 +688,7 @@ FX_BOOL CFX_PSRenderer::DrawText(int nChars,
}
void CFX_PSRenderer::WritePSBinary(const uint8_t* data, int len) {
uint8_t* dest_buf;
- FX_DWORD dest_size;
+ uint32_t dest_size;
CCodec_ModuleMgr* pEncoders = CFX_GEModule::Get()->GetCodecModule();
if (pEncoders &&
pEncoders->GetBasicModule()->A85Encode(data, len, dest_buf, dest_size)) {
diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp
index bcc630ca71..10c769aa6b 100644
--- a/core/fxge/ge/fx_ge_text.cpp
+++ b/core/fxge/ge/fx_ge_text.cpp
@@ -138,7 +138,7 @@ static const uint8_t g_TextGammaAdjust[256] = {
#define ADJUST_ALPHA(background, foreground, src_alpha, text_flags, a) \
src_alpha = g_TextGammaAdjust[(uint8_t)src_alpha];
void _Color2Argb(FX_ARGB& argb,
- FX_DWORD color,
+ uint32_t color,
int alpha_flag,
void* pIccTransform) {
if (!pIccTransform && !FXGETFLAG_COLORTYPE(alpha_flag)) {
@@ -177,8 +177,8 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars,
CFX_FontCache* pCache,
FX_FLOAT font_size,
const CFX_Matrix* pText2Device,
- FX_DWORD fill_color,
- FX_DWORD text_flags,
+ uint32_t fill_color,
+ uint32_t text_flags,
int alpha_flag,
void* pIccTransform) {
int nativetext_flags = text_flags;
@@ -1114,7 +1114,7 @@ FX_BOOL CFX_RenderDevice::DrawTextPath(int nChars,
const CFX_Matrix* pText2User,
const CFX_Matrix* pUser2Device,
const CFX_GraphStateData* pGraphState,
- FX_DWORD fill_color,
+ uint32_t fill_color,
FX_ARGB stroke_color,
CFX_PathData* pClippingPath,
int nFlag,
@@ -1256,7 +1256,7 @@ CFX_GlyphBitmap* CFX_FaceCache::LookUpGlyphBitmap(
CFX_Font* pFont,
const CFX_Matrix* pMatrix,
CFX_ByteStringC& FaceGlyphsKey,
- FX_DWORD glyph_index,
+ uint32_t glyph_index,
FX_BOOL bFontStyle,
int dest_width,
int anti_alias) {
@@ -1281,13 +1281,13 @@ CFX_GlyphBitmap* CFX_FaceCache::LookUpGlyphBitmap(
return pGlyphBitmap;
}
const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont,
- FX_DWORD glyph_index,
+ uint32_t glyph_index,
FX_BOOL bFontStyle,
const CFX_Matrix* pMatrix,
int dest_width,
int anti_alias,
int& text_flags) {
- if (glyph_index == (FX_DWORD)-1) {
+ if (glyph_index == (uint32_t)-1) {
return NULL;
}
_CFX_UniqueKeyGen keygen;
@@ -1512,7 +1512,7 @@ static void _ContrastAdjust(uint8_t* pDataIn,
}
}
CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(CFX_Font* pFont,
- FX_DWORD glyph_index,
+ uint32_t glyph_index,
FX_BOOL bFontStyle,
const CFX_Matrix* pMatrix,
int dest_width,
@@ -1647,12 +1647,12 @@ CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(CFX_Font* pFont,
return pGlyphBitmap;
}
const CFX_PathData* CFX_FaceCache::LoadGlyphPath(CFX_Font* pFont,
- FX_DWORD glyph_index,
+ uint32_t glyph_index,
int dest_width) {
- if (!m_Face || glyph_index == (FX_DWORD)-1)
+ if (!m_Face || glyph_index == (uint32_t)-1)
return nullptr;
- FX_DWORD key = glyph_index;
+ uint32_t key = glyph_index;
if (pFont->GetSubstFont()) {
key += (((pFont->GetSubstFont()->m_Weight / 16) << 15) +
((pFont->GetSubstFont()->m_ItalicAngle / 2) << 21) +
@@ -1792,7 +1792,7 @@ static int _Outline_CubicTo(const FXFT_Vector* control1,
return 0;
}
};
-CFX_PathData* CFX_Font::LoadGlyphPath(FX_DWORD glyph_index, int dest_width) {
+CFX_PathData* CFX_Font::LoadGlyphPath(uint32_t glyph_index, int dest_width) {
if (!m_Face) {
return NULL;
}
@@ -1868,8 +1868,8 @@ void _CFX_UniqueKeyGen::Generate(int count, ...) {
va_start(argList, count);
for (int i = 0; i < count; i++) {
int p = va_arg(argList, int);
- ((FX_DWORD*)m_Key)[i] = p;
+ ((uint32_t*)m_Key)[i] = p;
}
va_end(argList);
- m_KeyLen = count * sizeof(FX_DWORD);
+ m_KeyLen = count * sizeof(uint32_t);
}
diff --git a/core/fxge/ge/fx_text_int.h b/core/fxge/ge/fx_text_int.h
index d88b2a7cb9..04587c37cb 100644
--- a/core/fxge/ge/fx_text_int.h
+++ b/core/fxge/ge/fx_text_int.h
@@ -21,7 +21,7 @@ class CFX_SizeGlyphCache {
public:
CFX_SizeGlyphCache() {}
~CFX_SizeGlyphCache();
- std::map<FX_DWORD, CFX_GlyphBitmap*> m_GlyphMap;
+ std::map<uint32_t, CFX_GlyphBitmap*> m_GlyphMap;
};
class CTTFontDesc {
public:
@@ -62,8 +62,8 @@ class CFX_FontFaceInfo {
CFX_FontFaceInfo(CFX_ByteString filePath,
CFX_ByteString faceName,
CFX_ByteString fontTables,
- FX_DWORD fontOffset,
- FX_DWORD fileSize)
+ uint32_t fontOffset,
+ uint32_t fileSize)
: m_FilePath(filePath),
m_FaceName(faceName),
m_FontTables(fontTables),
@@ -75,10 +75,10 @@ class CFX_FontFaceInfo {
const CFX_ByteString m_FilePath;
const CFX_ByteString m_FaceName;
const CFX_ByteString m_FontTables;
- const FX_DWORD m_FontOffset;
- const FX_DWORD m_FileSize;
- FX_DWORD m_Styles;
- FX_DWORD m_Charsets;
+ const uint32_t m_FontOffset;
+ const uint32_t m_FileSize;
+ uint32_t m_Styles;
+ uint32_t m_Charsets;
};
#endif // CORE_FXGE_GE_FX_TEXT_INT_H_
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 17:03:39 +0000