summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2014-07-30 18:59:57 -0700
committerNico Weber <thakis@chromium.org>2014-07-30 18:59:57 -0700
commitec570e5f77986f6013ea42741001be5a3fcf47a7 (patch)
tree9a2298ac78c1bab688b299aa4d74e18eea1b4f67 /core
parent96608b3dbd60ecd1f288f2ddfc7af7628d49c0a0 (diff)
downloadpdfium-ec570e5f77986f6013ea42741001be5a3fcf47a7.tar.xz
Fix a few -Wreorder warnings.
BUG=pdfium:29 R=bo_xu@foxitsoftware.com Review URL: https://codereview.chromium.org/427353003
Diffstat (limited to 'core')
-rw-r--r--core/src/fpdftext/fpdf_text_int.cpp25
1 files changed, 11 insertions, 14 deletions
diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp
index ddf4762058..de4c703a04 100644
--- a/core/src/fpdftext/fpdf_text_int.cpp
+++ b/core/src/fpdftext/fpdf_text_int.cpp
@@ -68,10 +68,10 @@ IPDF_LinkExtract* IPDF_LinkExtract::CreateLinkExtract()
#define TEXT_LINEFEED L"\n"
#define TEXT_CHARRATIO_GAPDELTA 0.070
CPDF_TextPage::CPDF_TextPage(const CPDF_Page* pPage, int flags)
- : m_pPreTextObj(NULL),
- m_IsParsered(FALSE),
- m_charList(512),
+ : m_charList(512),
m_TempCharList(50),
+ m_pPreTextObj(NULL),
+ m_IsParsered(FALSE),
m_TextlineDir(-1),
m_CurlineRect(0, 0, 0, 0)
{
@@ -81,13 +81,13 @@ CPDF_TextPage::CPDF_TextPage(const CPDF_Page* pPage, int flags)
pPage->GetDisplayMatrix(m_DisplayMatrix, 0, 0, (int) pPage->GetPageWidth(), (int)pPage->GetPageHeight(), 0);
}
CPDF_TextPage::CPDF_TextPage(const CPDF_Page* pPage, CPDFText_ParseOptions ParserOptions)
- : m_pPreTextObj(NULL)
- , m_IsParsered(FALSE)
+ : m_ParseOptions(ParserOptions)
, m_charList(512)
, m_TempCharList(50)
+ , m_pPreTextObj(NULL)
+ , m_IsParsered(FALSE)
, m_TextlineDir(-1)
, m_CurlineRect(0, 0, 0, 0)
- , m_ParseOptions(ParserOptions)
{
m_pPage = pPage;
m_parserflag = 0;
@@ -95,10 +95,10 @@ CPDF_TextPage::CPDF_TextPage(const CPDF_Page* pPage, CPDFText_ParseOptions Parse
pPage->GetDisplayMatrix(m_DisplayMatrix, 0, 0, (int) pPage->GetPageWidth(), (int)pPage->GetPageHeight(), 0);
}
CPDF_TextPage::CPDF_TextPage(const CPDF_PageObjects* pPage, int flags)
- : m_pPreTextObj(NULL),
- m_IsParsered(FALSE),
- m_charList(512),
+ : m_charList(512),
m_TempCharList(50),
+ m_pPreTextObj(NULL),
+ m_IsParsered(FALSE),
m_TextlineDir(-1),
m_CurlineRect(0, 0, 0, 0)
{
@@ -1036,9 +1036,6 @@ void CPDF_TextPage::ProcessObject()
pPageObj = m_pPage->GetNextObject(pos);
if(pPageObj) {
if(pPageObj->m_Type == PDFPAGE_TEXT) {
- if (nCount == 3) {
- nCount = nCount;
- }
CFX_AffineMatrix matrix;
ProcessTextObject((CPDF_TextObject*)pPageObj, matrix, pos);
nCount++;
@@ -2169,8 +2166,8 @@ FX_BOOL CPDF_TextPage::IsLetter(FX_WCHAR unicode)
return TRUE;
}
CPDF_TextPageFind::CPDF_TextPageFind(const IPDF_TextPage* pTextPage)
- : m_IsFind(FALSE),
- m_pTextPage(NULL)
+ : m_pTextPage(NULL),
+ m_IsFind(FALSE)
{
if (!pTextPage) {
return;