diff options
| author | Nico Weber <thakis@chromium.org> | 2014-07-29 10:13:17 -0700 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2014-07-29 10:13:17 -0700 |
| commit | 6c55495fcaf634e7f788f4dfe77fa1a106c9cd55 (patch) | |
| tree | 3fe8612d47f51ff551e480a2088a48349cd9bdf7 /core/src/fpdfdoc | |
| parent | c77e8f73397613f278eaeef2cae44debc6a684c8 (diff) | |
| download | pdfium-6c55495fcaf634e7f788f4dfe77fa1a106c9cd55.tar.xz | |
Fix a few more warnings in chromium_code mode.
No intended behavior change.
- Remove more unused variables, functions, member variables.
- Put a few constructor initializers in the order they execute in.
- Add braces for subobject initializers.
- Fix a handful of signed / unsigned comparisons.
BUG=pdfium:29
R=bo_xu@foxitsoftware.com
Review URL: https://codereview.chromium.org/429593005
Diffstat (limited to 'core/src/fpdfdoc')
| -rw-r--r-- | core/src/fpdfdoc/doc_form.cpp | 8 | ||||
| -rw-r--r-- | core/src/fpdfdoc/doc_vt.cpp | 1 | ||||
| -rw-r--r-- | core/src/fpdfdoc/pdf_vt.h | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/core/src/fpdfdoc/doc_form.cpp b/core/src/fpdfdoc/doc_form.cpp index c1e41526d4..821b9981b8 100644 --- a/core/src/fpdfdoc/doc_form.cpp +++ b/core/src/fpdfdoc/doc_form.cpp @@ -1492,10 +1492,10 @@ const struct _SupportFieldEncoding { FX_LPCSTR m_name; FX_INT32 m_codePage; } g_fieldEncoding[] = { - "BigFive", 950, - "GBK", 936, - "Shift-JIS", 932, - "UHC", 949, + { "BigFive", 950 }, + { "GBK", 936 }, + { "Shift-JIS", 932 }, + { "UHC", 949 }, }; static void FPDFDOC_FDF_GetFieldValue(CPDF_Dictionary *pFieldDict, CFX_WideString &csValue, CFX_ByteString &bsEncoding) { diff --git a/core/src/fpdfdoc/doc_vt.cpp b/core/src/fpdfdoc/doc_vt.cpp index 9de9ffd426..09fa2bf416 100644 --- a/core/src/fpdfdoc/doc_vt.cpp +++ b/core/src/fpdfdoc/doc_vt.cpp @@ -815,7 +815,6 @@ CPDF_VariableText::CPDF_VariableText() : m_nCharArray(0), m_nAlignment(0), m_fCharSpace(0.0f), - m_fWordSpace(0.0f), m_fFontSize(0.0f), m_nHorzScale(100), m_wSubWord(0), diff --git a/core/src/fpdfdoc/pdf_vt.h b/core/src/fpdfdoc/pdf_vt.h index 0f74cef5bd..09ed0b0317 100644 --- a/core/src/fpdfdoc/pdf_vt.h +++ b/core/src/fpdfdoc/pdf_vt.h @@ -603,14 +603,11 @@ private: FX_FLOAT m_fCharSpace; FX_INT32 m_nHorzScale; FX_WORD m_wSubWord; - FX_FLOAT m_fWordSpace; FX_FLOAT m_fFontSize; private: FX_BOOL m_bInitial; FX_BOOL m_bRichText; - FX_FLOAT m_fCaretOriginX; - FX_INT32 m_nCurFontIndex; IPDF_VariableText_Provider * m_pVTProvider; CPDF_VariableText_Iterator * m_pVTIterator; }; |