summaryrefslogtreecommitdiff
path: root/core/include/fxge
diff options
context:
space:
mode:
Diffstat (limited to 'core/include/fxge')
-rw-r--r--core/include/fxge/fpf.h10
-rw-r--r--core/include/fxge/fx_dib.h84
-rw-r--r--core/include/fxge/fx_font.h94
-rw-r--r--core/include/fxge/fx_ge.h80
-rw-r--r--core/include/fxge/fx_ge_win32.h4
5 files changed, 136 insertions, 136 deletions
diff --git a/core/include/fxge/fpf.h b/core/include/fxge/fpf.h
index 6e596782cf..bc42a2dd95 100644
--- a/core/include/fxge/fpf.h
+++ b/core/include/fxge/fpf.h
@@ -31,7 +31,7 @@ class IFPF_Font {
virtual FPF_HFONT GetHandle() = 0;
virtual CFX_ByteString GetFamilyName() = 0;
virtual CFX_WideString GetPsName() = 0;
- virtual FX_DWORD GetFontStyle() const = 0;
+ virtual uint32_t GetFontStyle() const = 0;
virtual uint8_t GetCharset() const = 0;
virtual int32_t GetGlyphIndex(FX_WCHAR wUnicode) = 0;
@@ -45,9 +45,9 @@ class IFPF_Font {
virtual int32_t GetHeight() const = 0;
virtual int32_t GetItalicAngle() const = 0;
- virtual FX_DWORD GetFontData(FX_DWORD dwTable,
+ virtual uint32_t GetFontData(uint32_t dwTable,
uint8_t* pBuffer,
- FX_DWORD dwSize) = 0;
+ uint32_t dwSize) = 0;
protected:
virtual ~IFPF_Font() {}
@@ -63,8 +63,8 @@ class IFPF_FontMgr {
virtual IFPF_Font* CreateFont(const CFX_ByteStringC& bsFamilyname,
uint8_t charset,
- FX_DWORD dwStyle,
- FX_DWORD dwMatch = 0) = 0;
+ uint32_t dwStyle,
+ uint32_t dwMatch = 0) = 0;
};
#endif // CORE_INCLUDE_FXGE_FPF_H_
diff --git a/core/include/fxge/fx_dib.h b/core/include/fxge/fx_dib.h
index bc8954486d..09081786ef 100644
--- a/core/include/fxge/fx_dib.h
+++ b/core/include/fxge/fx_dib.h
@@ -60,9 +60,9 @@ enum FXDIB_Channel {
#define FXDIB_BLEND_COLOR 23
#define FXDIB_BLEND_LUMINOSITY 24
#define FXDIB_BLEND_UNSUPPORTED -1
-typedef FX_DWORD FX_ARGB;
-typedef FX_DWORD FX_COLORREF;
-typedef FX_DWORD FX_CMYK;
+typedef uint32_t FX_ARGB;
+typedef uint32_t FX_COLORREF;
+typedef uint32_t FX_CMYK;
class CFX_ClipRgn;
class CFX_DIBSource;
class CFX_DIBitmap;
@@ -93,7 +93,7 @@ FX_ARGB ArgbEncode(int a, FX_COLORREF rgb);
#define FXARGB_G(argb) ((uint8_t)((argb) >> 8))
#define FXARGB_B(argb) ((uint8_t)(argb))
#define FXARGB_MAKE(a, r, g, b) \
- (((FX_DWORD)(a) << 24) | ((r) << 16) | ((g) << 8) | (b))
+ (((uint32_t)(a) << 24) | ((r) << 16) | ((g) << 8) | (b))
#define FXARGB_MUL_ALPHA(argb, alpha) \
(((((argb) >> 24) * (alpha) / 255) << 24) | ((argb)&0xffffff))
#define FXRGB2GRAY(r, g, b) (((b)*11 + (g)*59 + (r)*30) / 100)
@@ -168,8 +168,8 @@ class CFX_DIBSource {
FXDIB_Format GetFormat() const {
return (FXDIB_Format)(m_AlphaFlag * 0x100 + m_bpp);
}
- FX_DWORD GetPitch() const { return m_Pitch; }
- FX_DWORD* GetPalette() const { return m_pPalette; }
+ uint32_t GetPitch() const { return m_Pitch; }
+ uint32_t* GetPalette() const { return m_pPalette; }
virtual uint8_t* GetBuffer() const;
virtual const uint8_t* GetScanline(int line) const = 0;
@@ -197,15 +197,15 @@ class CFX_DIBSource {
return IsAlphaMask() ? 0 : (m_bpp == 1 ? 2 : (m_bpp == 8 ? 256 : 0));
}
- FX_DWORD GetPaletteEntry(int index) const;
+ uint32_t GetPaletteEntry(int index) const;
- void SetPaletteEntry(int index, FX_DWORD color);
- FX_DWORD GetPaletteArgb(int index) const { return GetPaletteEntry(index); }
- void SetPaletteArgb(int index, FX_DWORD color) {
+ void SetPaletteEntry(int index, uint32_t color);
+ uint32_t GetPaletteArgb(int index) const { return GetPaletteEntry(index); }
+ void SetPaletteArgb(int index, uint32_t color) {
SetPaletteEntry(index, color);
}
- void CopyPalette(const FX_DWORD* pSrcPal, FX_DWORD size = 256);
+ void CopyPalette(const uint32_t* pSrcPal, uint32_t size = 256);
CFX_DIBitmap* Clone(const FX_RECT* pClip = NULL) const;
CFX_DIBitmap* CloneConvert(FXDIB_Format format,
@@ -214,12 +214,12 @@ class CFX_DIBSource {
CFX_DIBitmap* StretchTo(int dest_width,
int dest_height,
- FX_DWORD flags = 0,
+ uint32_t flags = 0,
const FX_RECT* pClip = NULL) const;
CFX_DIBitmap* TransformTo(const CFX_Matrix* pMatrix,
int& left,
int& top,
- FX_DWORD flags = 0,
+ uint32_t flags = 0,
const FX_RECT* pClip = NULL) const;
CFX_DIBitmap* GetAlphaMask(const FX_RECT* pClip = NULL) const;
@@ -250,14 +250,14 @@ class CFX_DIBSource {
int m_Width;
int m_Height;
int m_bpp;
- FX_DWORD m_AlphaFlag;
- FX_DWORD m_Pitch;
- FX_DWORD* m_pPalette;
+ uint32_t m_AlphaFlag;
+ uint32_t m_Pitch;
+ uint32_t* m_pPalette;
void BuildPalette();
FX_BOOL BuildAlphaMask();
- int FindPalette(FX_DWORD color) const;
- void GetPalette(FX_DWORD* pal, int alpha) const;
+ int FindPalette(uint32_t color) const;
+ void GetPalette(uint32_t* pal, int alpha) const;
};
class CFX_DIBitmap : public CFX_DIBSource {
public:
@@ -288,11 +288,11 @@ class CFX_DIBitmap : public CFX_DIBSource {
FX_BOOL ConvertFormat(FXDIB_Format format, void* pIccTransform = NULL);
- void Clear(FX_DWORD color);
+ void Clear(uint32_t color);
- FX_DWORD GetPixel(int x, int y) const;
+ uint32_t GetPixel(int x, int y) const;
- void SetPixel(int x, int y, FX_DWORD color);
+ void SetPixel(int x, int y, uint32_t color);
FX_BOOL LoadChannel(FXDIB_Channel destChannel,
const CFX_DIBSource* pSrcBitmap,
@@ -330,7 +330,7 @@ class CFX_DIBitmap : public CFX_DIBSource {
int width,
int height,
const CFX_DIBSource* pMask,
- FX_DWORD color,
+ uint32_t color,
int src_left,
int src_top,
int alpha_flag = 0,
@@ -341,7 +341,7 @@ class CFX_DIBitmap : public CFX_DIBSource {
int width,
int height,
const CFX_DIBSource* pMask,
- FX_DWORD color,
+ uint32_t color,
int src_left,
int src_top,
int blend_type = FXDIB_BLEND_NORMAL,
@@ -354,13 +354,13 @@ class CFX_DIBitmap : public CFX_DIBSource {
int dest_top,
int width,
int height,
- FX_DWORD color,
+ uint32_t color,
int alpha_flag = 0,
void* pIccTransform = NULL);
- FX_BOOL ConvertColorScale(FX_DWORD forecolor, FX_DWORD backcolor);
+ FX_BOOL ConvertColorScale(uint32_t forecolor, uint32_t backcolor);
- FX_BOOL DitherFS(const FX_DWORD* pPalette,
+ FX_BOOL DitherFS(const uint32_t* pPalette,
int pal_size,
const FX_RECT* pRect = NULL);
@@ -393,7 +393,7 @@ class CFX_FilteredDIB : public CFX_DIBSource {
virtual FXDIB_Format GetDestFormat() = 0;
- virtual FX_DWORD* GetDestPalette() = 0;
+ virtual uint32_t* GetDestPalette() = 0;
virtual void TranslateScanline(uint8_t* dest_buf,
const uint8_t* src_buf) const = 0;
@@ -432,7 +432,7 @@ class IFX_ScanlineComposer {
virtual FX_BOOL SetInfo(int width,
int height,
FXDIB_Format src_format,
- FX_DWORD* pSrcPalette) = 0;
+ uint32_t* pSrcPalette) = 0;
};
class CFX_ScanlineCompositor {
public:
@@ -443,8 +443,8 @@ class CFX_ScanlineCompositor {
FX_BOOL Init(FXDIB_Format dest_format,
FXDIB_Format src_format,
int32_t width,
- FX_DWORD* pSrcPalette,
- FX_DWORD mask_color,
+ uint32_t* pSrcPalette,
+ uint32_t mask_color,
int blend_type,
FX_BOOL bClip,
FX_BOOL bRgbByteOrder = FALSE,
@@ -482,7 +482,7 @@ class CFX_ScanlineCompositor {
protected:
int m_Transparency;
FXDIB_Format m_SrcFormat, m_DestFormat;
- FX_DWORD* m_pSrcPalette;
+ uint32_t* m_pSrcPalette;
int m_MaskAlpha, m_MaskRed, m_MaskGreen, m_MaskBlue, m_MaskBlack;
int m_BlendType;
@@ -500,7 +500,7 @@ class CFX_BitmapComposer : public IFX_ScanlineComposer {
void Compose(CFX_DIBitmap* pDest,
const CFX_ClipRgn* pClipRgn,
int bitmap_alpha,
- FX_DWORD mask_color,
+ uint32_t mask_color,
FX_RECT& dest_rect,
FX_BOOL bVertical,
FX_BOOL bFlipX,
@@ -514,7 +514,7 @@ class CFX_BitmapComposer : public IFX_ScanlineComposer {
FX_BOOL SetInfo(int width,
int height,
FXDIB_Format src_format,
- FX_DWORD* pSrcPalette) override;
+ uint32_t* pSrcPalette) override;
void ComposeScanline(int line,
const uint8_t* scanline,
@@ -531,7 +531,7 @@ class CFX_BitmapComposer : public IFX_ScanlineComposer {
const CFX_ClipRgn* m_pClipRgn;
FXDIB_Format m_SrcFormat;
int m_DestLeft, m_DestTop, m_DestWidth, m_DestHeight, m_BitmapAlpha;
- FX_DWORD m_MaskColor;
+ uint32_t m_MaskColor;
const CFX_DIBitmap* m_pClipMask;
CFX_ScanlineCompositor m_Compositor;
FX_BOOL m_bVertical, m_bFlipX, m_bFlipY;
@@ -561,7 +561,7 @@ class CFX_BitmapStorer : public IFX_ScanlineComposer {
FX_BOOL SetInfo(int width,
int height,
FXDIB_Format src_format,
- FX_DWORD* pSrcPalette) override;
+ uint32_t* pSrcPalette) override;
CFX_DIBitmap* GetBitmap() { return m_pBitmap; }
@@ -583,7 +583,7 @@ class CFX_ImageStretcher {
int dest_width,
int dest_height,
const FX_RECT& bitmap_rect,
- FX_DWORD flags);
+ uint32_t flags);
FX_BOOL Continue(IFX_Pause* pPause);
FX_BOOL StartQuickStretch();
@@ -594,7 +594,7 @@ class CFX_ImageStretcher {
IFX_ScanlineComposer* m_pDest;
const CFX_DIBSource* m_pSource;
CStretchEngine* m_pStretchEngine;
- FX_DWORD m_Flags;
+ uint32_t m_Flags;
FX_BOOL m_bFlipX;
FX_BOOL m_bFlipY;
int m_DestWidth;
@@ -627,7 +627,7 @@ class CFX_ImageTransformer {
CFX_Matrix m_dest2stretch;
CFX_ImageStretcher m_Stretcher;
CFX_BitmapStorer m_Storer;
- FX_DWORD m_Flags;
+ uint32_t m_Flags;
int m_Status;
};
class CFX_ImageRenderer {
@@ -639,9 +639,9 @@ class CFX_ImageRenderer {
const CFX_ClipRgn* pClipRgn,
const CFX_DIBSource* pSource,
int bitmap_alpha,
- FX_DWORD mask_color,
+ uint32_t mask_color,
const CFX_Matrix* pMatrix,
- FX_DWORD dib_flags,
+ uint32_t dib_flags,
FX_BOOL bRgbByteOrder = FALSE,
int alpha_flag = 0,
void* pIccTransform = NULL,
@@ -653,14 +653,14 @@ class CFX_ImageRenderer {
CFX_DIBitmap* m_pDevice;
const CFX_ClipRgn* m_pClipRgn;
int m_BitmapAlpha;
- FX_DWORD m_MaskColor;
+ uint32_t m_MaskColor;
CFX_Matrix m_Matrix;
CFX_ImageTransformer* m_pTransformer;
CFX_ImageStretcher m_Stretcher;
CFX_BitmapComposer m_Composer;
int m_Status;
FX_RECT m_ClipBox;
- FX_DWORD m_Flags;
+ uint32_t m_Flags;
int m_AlphaFlag;
void* m_pIccTransform;
FX_BOOL m_bRgbByteOrder;
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 382a916734..c52e614e97 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -66,12 +66,12 @@ class CFX_Font {
void LoadSubst(const CFX_ByteString& face_name,
FX_BOOL bTrueType,
- FX_DWORD flags,
+ uint32_t flags,
int weight,
int italic_angle,
int CharsetCP,
FX_BOOL bVertical = FALSE);
- FX_BOOL LoadEmbedded(const uint8_t* data, FX_DWORD size);
+ FX_BOOL LoadEmbedded(const uint8_t* data, uint32_t size);
FXFT_Face GetFace() const { return m_Face; }
#ifdef PDF_ENABLE_XFA
@@ -87,11 +87,11 @@ class CFX_Font {
const CFX_SubstFont* GetSubstFont() const { return m_pSubstFont; }
#endif // PDF_ENABLE_XFA
- CFX_PathData* LoadGlyphPath(FX_DWORD glyph_index, int dest_width = 0);
- int GetGlyphWidth(FX_DWORD glyph_index);
+ CFX_PathData* LoadGlyphPath(uint32_t glyph_index, int dest_width = 0);
+ int GetGlyphWidth(uint32_t glyph_index);
int GetAscent() const;
int GetDescent() const;
- FX_BOOL GetGlyphBBox(FX_DWORD glyph_index, FX_RECT& bbox);
+ FX_BOOL GetGlyphBBox(uint32_t glyph_index, FX_RECT& bbox);
FX_BOOL IsItalic() const;
FX_BOOL IsBold() const;
FX_BOOL IsFixedWidth() const;
@@ -111,7 +111,7 @@ class CFX_Font {
void* GetPlatformFont() const { return m_pPlatformFont; }
void SetPlatformFont(void* font) { m_pPlatformFont = font; }
uint8_t* GetFontData() const { return m_pFontData; }
- FX_DWORD GetSize() const { return m_dwSize; }
+ uint32_t GetSize() const { return m_dwSize; }
void AdjustMMParams(int glyph_index, int width, int weight);
private:
@@ -123,7 +123,7 @@ class CFX_Font {
uint8_t* m_pFontDataAllocation;
uint8_t* m_pFontData;
uint8_t* m_pGsubData;
- FX_DWORD m_dwSize;
+ uint32_t m_dwSize;
CFX_BinaryBuf m_OtfFontData;
void* m_hHandle;
void* m_pPlatformFont;
@@ -147,8 +147,8 @@ class CFX_Font {
#ifdef PDF_ENABLE_XFA
#define FXFM_ENC_TAG(a, b, c, d) \
- (((FX_DWORD)(a) << 24) | ((FX_DWORD)(b) << 16) | ((FX_DWORD)(c) << 8) | \
- (FX_DWORD)(d))
+ (((uint32_t)(a) << 24) | ((uint32_t)(b) << 16) | ((uint32_t)(c) << 8) | \
+ (uint32_t)(d))
#define FXFM_ENCODING_NONE FXFM_ENC_TAG(0, 0, 0, 0)
#define FXFM_ENCODING_MS_SYMBOL FXFM_ENC_TAG('s', 'y', 'm', 'b')
#define FXFM_ENCODING_UNICODE FXFM_ENC_TAG('u', 'n', 'i', 'c')
@@ -170,7 +170,7 @@ class CFX_UnicodeEncoding {
explicit CFX_UnicodeEncoding(CFX_Font* pFont);
virtual ~CFX_UnicodeEncoding();
- virtual FX_DWORD GlyphFromCharCode(FX_DWORD charcode);
+ virtual uint32_t GlyphFromCharCode(uint32_t charcode);
protected:
// Unowned, not nullptr.
@@ -180,20 +180,20 @@ class CFX_UnicodeEncoding {
#ifdef PDF_ENABLE_XFA
class CFX_UnicodeEncodingEx : public CFX_UnicodeEncoding {
public:
- CFX_UnicodeEncodingEx(CFX_Font* pFont, FX_DWORD EncodingID);
+ CFX_UnicodeEncodingEx(CFX_Font* pFont, uint32_t EncodingID);
~CFX_UnicodeEncodingEx() override;
// CFX_UnicodeEncoding:
- FX_DWORD GlyphFromCharCode(FX_DWORD charcode) override;
+ uint32_t GlyphFromCharCode(uint32_t charcode) override;
- FX_DWORD CharCodeFromUnicode(FX_WCHAR Unicode) const;
+ uint32_t CharCodeFromUnicode(FX_WCHAR Unicode) const;
private:
- FX_DWORD m_nEncodingID;
+ uint32_t m_nEncodingID;
};
CFX_UnicodeEncodingEx* FX_CreateFontEncodingEx(
CFX_Font* pFont,
- FX_DWORD nEncodingID = FXFM_ENCODING_NONE);
+ uint32_t nEncodingID = FXFM_ENCODING_NONE);
#endif // PDF_ENABLE_XFA
#define FXFONT_SUBST_MM 0x01
@@ -214,7 +214,7 @@ class CFX_SubstFont {
int m_Charset;
- FX_DWORD m_SubstFlags;
+ uint32_t m_SubstFlags;
int m_Weight;
@@ -249,29 +249,29 @@ class CFX_FontMgr {
int weight,
FX_BOOL bItalic,
uint8_t* pData,
- FX_DWORD size,
+ uint32_t size,
int face_index);
FXFT_Face GetCachedTTCFace(int ttc_size,
- FX_DWORD checksum,
+ uint32_t checksum,
int font_offset,
uint8_t*& pFontData);
FXFT_Face AddCachedTTCFace(int ttc_size,
- FX_DWORD checksum,
+ uint32_t checksum,
uint8_t* pData,
- FX_DWORD size,
+ uint32_t size,
int font_offset);
FXFT_Face GetFileFace(const FX_CHAR* filename, int face_index);
- FXFT_Face GetFixedFace(const uint8_t* pData, FX_DWORD size, int face_index);
+ FXFT_Face GetFixedFace(const uint8_t* pData, uint32_t size, int face_index);
void ReleaseFace(FXFT_Face face);
void SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo);
FXFT_Face FindSubstFont(const CFX_ByteString& face_name,
FX_BOOL bTrueType,
- FX_DWORD flags,
+ uint32_t flags,
int weight,
int italic_angle,
int CharsetCP,
CFX_SubstFont* pSubstFont);
- bool GetBuiltinFont(size_t index, const uint8_t** pFontData, FX_DWORD* size);
+ bool GetBuiltinFont(size_t index, const uint8_t** pFontData, uint32_t* size);
CFX_FontMapper* GetBuiltinMapper() const { return m_pBuiltinMapper.get(); }
FXFT_Library GetFTLibrary() const { return m_FTLibrary; }
@@ -316,14 +316,14 @@ class CFX_FontMapper {
IFX_FontEnumerator* GetFontEnumerator() const { return m_pFontEnumerator; }
FXFT_Face FindSubstFont(const CFX_ByteString& face_name,
FX_BOOL bTrueType,
- FX_DWORD flags,
+ uint32_t flags,
int weight,
int italic_angle,
int CharsetCP,
CFX_SubstFont* pSubstFont);
#ifdef PDF_ENABLE_XFA
- FXFT_Face FindSubstFontByUnicode(FX_DWORD dwUnicode,
- FX_DWORD flags,
+ FXFT_Face FindSubstFontByUnicode(uint32_t dwUnicode,
+ uint32_t flags,
int weight,
int italic_angle);
#endif // PDF_ENABLE_XFA
@@ -346,7 +346,7 @@ class CFX_FontMapper {
FX_BOOL m_bListLoaded;
FXFT_Face m_MMFaces[MM_FACE_COUNT];
CFX_ByteString m_LastFamily;
- CFX_ArrayTemplate<FX_DWORD> m_CharsetArray;
+ CFX_ArrayTemplate<uint32_t> m_CharsetArray;
std::vector<CFX_ByteString> m_FaceArray;
IFX_SystemFontInfo* m_pFontInfo;
FXFT_Face m_FoxitFaces[FOXIT_FACE_COUNT];
@@ -368,17 +368,17 @@ class IFX_SystemFontInfo {
int& iExact) = 0;
#ifdef PDF_ENABLE_XFA
- virtual void* MapFontByUnicode(FX_DWORD dwUnicode,
+ virtual void* MapFontByUnicode(uint32_t dwUnicode,
int weight,
FX_BOOL bItalic,
int pitch_family);
#endif // PDF_ENABLE_XFA
virtual void* GetFont(const FX_CHAR* face) = 0;
- virtual FX_DWORD GetFontData(void* hFont,
- FX_DWORD table,
+ virtual uint32_t GetFontData(void* hFont,
+ uint32_t table,
uint8_t* buffer,
- FX_DWORD size) = 0;
+ uint32_t size) = 0;
virtual FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) = 0;
virtual FX_BOOL GetFontCharset(void* hFont, int& charset) = 0;
virtual int GetFaceIndex(void* hFont);
@@ -405,16 +405,16 @@ class CFX_FolderFontInfo : public IFX_SystemFontInfo {
const FX_CHAR* face,
int& bExact) override;
#ifdef PDF_ENABLE_XFA
- void* MapFontByUnicode(FX_DWORD dwUnicode,
+ void* MapFontByUnicode(uint32_t dwUnicode,
int weight,
FX_BOOL bItalic,
int pitch_family) override;
#endif // PDF_ENABLE_XFA
void* GetFont(const FX_CHAR* face) override;
- FX_DWORD GetFontData(void* hFont,
- FX_DWORD table,
+ uint32_t GetFontData(void* hFont,
+ uint32_t table,
uint8_t* buffer,
- FX_DWORD size) override;
+ uint32_t size) override;
void DeleteFont(void* hFont) override;
FX_BOOL GetFaceName(void* hFont, CFX_ByteString& name) override;
FX_BOOL GetFontCharset(void* hFont, int& charset) override;
@@ -424,8 +424,8 @@ class CFX_FolderFontInfo : public IFX_SystemFontInfo {
void ScanFile(const CFX_ByteString& path);
void ReportFace(const CFX_ByteString& path,
FXSYS_FILE* pFile,
- FX_DWORD filesize,
- FX_DWORD offset);
+ uint32_t filesize,
+ uint32_t offset);
void* GetSubstFont(const CFX_ByteString& face);
void* FindFont(int weight,
FX_BOOL bItalic,
@@ -442,7 +442,7 @@ class CFX_FolderFontInfo : public IFX_SystemFontInfo {
class CFX_CountedFaceCache {
public:
CFX_FaceCache* m_Obj;
- FX_DWORD m_nCount;
+ uint32_t m_nCount;
};
class CFX_FontCache {
@@ -480,32 +480,32 @@ class CFX_FaceCache {
explicit CFX_FaceCache(FXFT_Face face);
~CFX_FaceCache();
const CFX_GlyphBitmap* 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);
const CFX_PathData* LoadGlyphPath(CFX_Font* pFont,
- FX_DWORD glyph_index,
+ uint32_t glyph_index,
int dest_width);
private:
CFX_GlyphBitmap* RenderGlyph(CFX_Font* pFont,
- FX_DWORD glyph_index,
+ uint32_t glyph_index,
FX_BOOL bFontStyle,
const CFX_Matrix* pMatrix,
int dest_width,
int anti_alias);
CFX_GlyphBitmap* RenderGlyph_Nativetext(CFX_Font* pFont,
- FX_DWORD glyph_index,
+ uint32_t glyph_index,
const CFX_Matrix* pMatrix,
int dest_width,
int anti_alias);
CFX_GlyphBitmap* 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);
@@ -514,7 +514,7 @@ class CFX_FaceCache {
FXFT_Face const m_Face;
std::map<CFX_ByteString, CFX_SizeGlyphCache*> m_SizeMap;
- std::map<FX_DWORD, CFX_PathData*> m_PathMap;
+ std::map<uint32_t, CFX_PathData*> m_PathMap;
CFX_DIBitmap* m_pBitmap;
};
@@ -535,15 +535,15 @@ FX_RECT FXGE_GetGlyphsBBox(FXTEXT_GLYPHPOS* pGlyphAndPos,
class IFX_GSUBTable {
public:
static IFX_GSUBTable* Create(CFX_Font* pFont);
- virtual FX_BOOL GetVerticalGlyph(FX_DWORD glyphnum, FX_DWORD* vglyphnum) = 0;
+ virtual FX_BOOL GetVerticalGlyph(uint32_t glyphnum, uint32_t* vglyphnum) = 0;
protected:
virtual ~IFX_GSUBTable() {}
};
CFX_ByteString GetNameFromTT(const uint8_t* name_table,
- FX_DWORD name_table_size,
- FX_DWORD name);
+ uint32_t name_table_size,
+ uint32_t name);
int PDF_GetStandardFontName(CFX_ByteString* name);
diff --git a/core/include/fxge/fx_ge.h b/core/include/fxge/fx_ge.h
index d824d08228..3eb9303a80 100644
--- a/core/include/fxge/fx_ge.h
+++ b/core/include/fxge/fx_ge.h
@@ -235,12 +235,12 @@ class CFX_GraphStateData {
#define FXTEXT_PRINTIMAGETEXT 0x10
#define FXTEXT_NOSMOOTH 0x20
typedef struct {
- FX_DWORD m_GlyphIndex;
+ uint32_t m_GlyphIndex;
FX_FLOAT m_OriginX, m_OriginY;
int m_FontCharWidth;
FX_BOOL m_bGlyphAdjust;
FX_FLOAT m_AdjustMatrix[4];
- FX_DWORD m_ExtGID;
+ uint32_t m_ExtGID;
FX_BOOL m_bFontStyle;
} FXTEXT_CHARPOS;
@@ -286,8 +286,8 @@ class CFX_RenderDevice {
FX_BOOL 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 = 0,
void* pIccTransform = NULL,
@@ -295,12 +295,12 @@ class CFX_RenderDevice {
FX_BOOL SetPixel(int x,
int y,
- FX_DWORD color,
+ uint32_t color,
int alpha_flag = 0,
void* pIccTransform = NULL);
FX_BOOL FillRect(const FX_RECT* pRect,
- FX_DWORD color,
+ uint32_t color,
int alpha_flag = 0,
void* pIccTransform = NULL,
int blend_type = FXDIB_BLEND_NORMAL);
@@ -309,7 +309,7 @@ class CFX_RenderDevice {
FX_FLOAT y1,
FX_FLOAT x2,
FX_FLOAT y2,
- FX_DWORD color,
+ uint32_t color,
int fill_mode = 0,
int alpha_flag = 0,
void* pIccTransform = NULL,
@@ -333,14 +333,14 @@ class CFX_RenderDevice {
int top,
int dest_width,
int dest_height,
- FX_DWORD flags = 0,
+ uint32_t flags = 0,
void* pIccTransform = NULL,
int blend_type = FXDIB_BLEND_NORMAL);
FX_BOOL SetBitMask(const CFX_DIBSource* pBitmap,
int left,
int top,
- FX_DWORD color,
+ uint32_t color,
int alpha_flag = 0,
void* pIccTransform = NULL);
@@ -349,16 +349,16 @@ class CFX_RenderDevice {
int top,
int dest_width,
int dest_height,
- FX_DWORD color,
- FX_DWORD flags = 0,
+ uint32_t color,
+ uint32_t flags = 0,
int alpha_flag = 0,
void* pIccTransform = NULL);
FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap,
int bitmap_alpha,
- FX_DWORD color,
+ uint32_t color,
const CFX_Matrix* pMatrix,
- FX_DWORD flags,
+ uint32_t flags,
void*& handle,
int alpha_flag = 0,
void* pIccTransform = NULL,
@@ -374,8 +374,8 @@ class CFX_RenderDevice {
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 = 0,
void* pIccTransform = NULL);
@@ -387,8 +387,8 @@ class CFX_RenderDevice {
const CFX_Matrix* pText2User,
const CFX_Matrix* pUser2Device,
const CFX_GraphStateData* pGraphState,
- FX_DWORD fill_color,
- FX_DWORD stroke_color,
+ uint32_t fill_color,
+ uint32_t stroke_color,
CFX_PathData* pClippingPath,
int nFlag = 0,
int alpha_flag = 0,
@@ -403,8 +403,8 @@ class CFX_RenderDevice {
FX_BOOL 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,
@@ -505,8 +505,8 @@ class IFX_RenderDeviceDriver {
virtual FX_BOOL 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 = 0,
void* pIccTransform = NULL,
@@ -514,14 +514,14 @@ class IFX_RenderDeviceDriver {
virtual FX_BOOL SetPixel(int x,
int y,
- FX_DWORD color,
+ uint32_t color,
int alpha_flag = 0,
void* pIccTransform = NULL) {
return FALSE;
}
virtual FX_BOOL FillRect(const FX_RECT* pRect,
- FX_DWORD fill_color,
+ uint32_t fill_color,
int alpha_flag = 0,
void* pIccTransform = NULL,
int blend_type = FXDIB_BLEND_NORMAL) {
@@ -532,7 +532,7 @@ class IFX_RenderDeviceDriver {
FX_FLOAT y1,
FX_FLOAT x2,
FX_FLOAT y2,
- FX_DWORD color,
+ uint32_t color,
int alpha_flag = 0,
void* pIccTransform = NULL,
int blend_type = FXDIB_BLEND_NORMAL) {
@@ -551,7 +551,7 @@ class IFX_RenderDeviceDriver {
virtual CFX_DIBitmap* GetBackDrop() { return NULL; }
virtual FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap,
- FX_DWORD color,
+ uint32_t color,
const FX_RECT* pSrcRect,
int dest_left,
int dest_top,
@@ -560,22 +560,22 @@ class IFX_RenderDeviceDriver {
void* pIccTransform = NULL) = 0;
virtual FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap,
- FX_DWORD color,
+ uint32_t color,
int dest_left,
int dest_top,
int dest_width,
int dest_height,
const FX_RECT* pClipRect,
- FX_DWORD flags,
+ uint32_t flags,
int alpha_flag = 0,
void* pIccTransform = NULL,
int blend_type = FXDIB_BLEND_NORMAL) = 0;
virtual FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap,
int bitmap_alpha,
- FX_DWORD color,
+ uint32_t color,
const CFX_Matrix* pMatrix,
- FX_DWORD flags,
+ uint32_t flags,
void*& handle,
int alpha_flag = 0,
void* pIccTransform = NULL,
@@ -593,7 +593,7 @@ class IFX_RenderDeviceDriver {
CFX_FontCache* pCache,
const CFX_Matrix* pObject2Device,
FX_FLOAT font_size,
- FX_DWORD color,
+ uint32_t color,
int alpha_flag = 0,
void* pIccTransform = NULL) {
return FALSE;
@@ -652,33 +652,33 @@ class CFX_PSRenderer {
FX_BOOL 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 = 0,
void* pIccTransform = NULL);
FX_BOOL SetDIBits(const CFX_DIBSource* pBitmap,
- FX_DWORD color,
+ uint32_t color,
int dest_left,
int dest_top,
int alpha_flag = 0,
void* pIccTransform = NULL);
FX_BOOL StretchDIBits(const CFX_DIBSource* pBitmap,
- 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 = 0,
void* pIccTransform = NULL);
FX_BOOL DrawDIBits(const CFX_DIBSource* pBitmap,
- FX_DWORD color,
+ uint32_t color,
const CFX_Matrix* pMatrix,
- FX_DWORD flags,
+ uint32_t flags,
int alpha_flag = 0,
void* pIccTransform = NULL);
@@ -688,7 +688,7 @@ class CFX_PSRenderer {
CFX_FontCache* pCache,
const CFX_Matrix* pObject2Device,
FX_FLOAT font_size,
- FX_DWORD color,
+ uint32_t color,
int alpha_flag = 0,
void* pIccTransform = NULL);
@@ -705,7 +705,7 @@ class CFX_PSRenderer {
FX_BOOL m_bColorSet;
- FX_DWORD m_LastColor;
+ uint32_t m_LastColor;
FX_RECT m_ClipBox;
@@ -719,7 +719,7 @@ class CFX_PSRenderer {
void SetGraphState(const CFX_GraphStateData* pGraphState);
- void SetColor(FX_DWORD color, int alpha_flag, void* pIccTransform);
+ void SetColor(uint32_t color, int alpha_flag, void* pIccTransform);
void FindPSFontGlyph(CFX_FaceCache* pFaceCache,
CFX_Font* pFont,
diff --git a/core/include/fxge/fx_ge_win32.h b/core/include/fxge/fx_ge_win32.h
index 149c46d40b..f1864590c5 100644
--- a/core/include/fxge/fx_ge_win32.h
+++ b/core/include/fxge/fx_ge_win32.h
@@ -32,8 +32,8 @@ class CFX_WindowsDIB : public CFX_DIBitmap {
static CFX_DIBitmap* LoadFromDDB(HDC hDC,
HBITMAP hBitmap,
- FX_DWORD* pPalette = NULL,
- FX_DWORD size = 256);
+ uint32_t* pPalette = NULL,
+ uint32_t size = 256);
static CFX_DIBitmap* LoadFromFile(const FX_WCHAR* filename);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 03:09:13 +0000