summaryrefslogtreecommitdiff
path: root/core/fxge
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxge')
-rw-r--r--core/fxge/cfx_font.h6
-rw-r--r--core/fxge/win32/cfx_windowsdib.h7
2 files changed, 5 insertions, 8 deletions
diff --git a/core/fxge/cfx_font.h b/core/fxge/cfx_font.h
index 0d858ea5c4..5bd93ea7e1 100644
--- a/core/fxge/cfx_font.h
+++ b/core/fxge/cfx_font.h
@@ -103,11 +103,11 @@ class CFX_Font {
static const uint8_t s_WeightPow_11[kWeightPowArraySize];
static const uint8_t s_WeightPow_SHIFTJIS[kWeightPowArraySize];
- // This struct shoub same as FPDF_CharsetFontMap
- typedef struct {
+ // This struct should be the same as FPDF_CharsetFontMap.
+ struct CharsetFontMap {
int charset; // Character Set Enum value, see FX_CHARSET_XXX.
const char* fontname; // Name of default font to use with that charset.
- } CharsetFontMap;
+ };
/**
* Pointer to the default character set to TT Font name map. The
diff --git a/core/fxge/win32/cfx_windowsdib.h b/core/fxge/win32/cfx_windowsdib.h
index 3120b8f543..c64fc7dc16 100644
--- a/core/fxge/win32/cfx_windowsdib.h
+++ b/core/fxge/win32/cfx_windowsdib.h
@@ -17,15 +17,12 @@
#define WINDIB_OPEN_MEMORY 0x1
#define WINDIB_OPEN_PATHNAME 0x2
-typedef struct WINDIB_Open_Args_ {
+struct WINDIB_Open_Args_ {
int flags;
-
const uint8_t* memory_base;
-
size_t memory_size;
-
const wchar_t* path_name;
-} WINDIB_Open_Args_;
+};
class CFX_WindowsDIB : public CFX_DIBitmap {
public: