summaryrefslogtreecommitdiff
path: root/core/fxge
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-08-10 17:41:29 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-08-10 17:41:29 +0000
commit6655d95a8586c1f272d5d418bb63514abbe1d695 (patch)
tree6559d283e8136f4866795087f6886e6c0ab15927 /core/fxge
parentef7c9553811c8b45ada69260e9abf5d4444bcd51 (diff)
downloadpdfium-6655d95a8586c1f272d5d418bb63514abbe1d695.tar.xz
Remove |typedef struct| in favor of just |struct|.
Because I saw one in some other code and decided to hunt them all. These are all defined in C++ context, so no chance of C compatiblity. Note that such a declaration without a struct tag will bypass the [chromium-style] out-of-line constructor/destructor warnings, so add constructors/destructors where required. Change-Id: Ib821d8bc2f68ccf7028b0f73432e8e7c93a953ba Reviewed-on: https://pdfium-review.googlesource.com/39851 Commit-Queue: Tom Sepez <tsepez@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
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: