diff options
author | Lei Zhang <thestig@chromium.org> | 2017-11-02 19:50:58 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-02 19:50:58 +0000 |
commit | f1be1e87045da36b52326fb269f7006670c0c9ab (patch) | |
tree | 629877b8d7bf46132e2f04ca655fe1cfcc1fc42a /core/fpdfapi/page | |
parent | eda1761e6a90058a97cee1bcd763a2447eb6a67b (diff) | |
download | pdfium-f1be1e87045da36b52326fb269f7006670c0c9ab.tar.xz |
Rename Transparency to iTransparency.
Fix a mismatched parameter name in cpdf_renderstatus.h too.
Change-Id: I9765838e6ab93db37791fc282e553b6cb9c51ec5
Reviewed-on: https://pdfium-review.googlesource.com/17050
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi/page')
-rw-r--r-- | core/fpdfapi/page/cpdf_contentparser.cpp | 2 | ||||
-rw-r--r-- | core/fpdfapi/page/cpdf_form.cpp | 2 | ||||
-rw-r--r-- | core/fpdfapi/page/cpdf_page.cpp | 2 | ||||
-rw-r--r-- | core/fpdfapi/page/cpdf_pageobjectholder.cpp | 8 | ||||
-rw-r--r-- | core/fpdfapi/page/cpdf_pageobjectholder.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/core/fpdfapi/page/cpdf_contentparser.cpp b/core/fpdfapi/page/cpdf_contentparser.cpp index 3032f2cd01..bf2fc33538 100644 --- a/core/fpdfapi/page/cpdf_contentparser.cpp +++ b/core/fpdfapi/page/cpdf_contentparser.cpp @@ -108,7 +108,7 @@ void CPDF_ContentParser::Start(CPDF_Form* pForm, m_pParser->GetCurStates()->m_ClipPath.AppendPath(ClipPath, FXFILL_WINDING, true); } - if (pForm->m_Transparency & PDFTRANS_GROUP) { + if (pForm->m_iTransparency & PDFTRANS_GROUP) { CPDF_GeneralState* pState = &m_pParser->GetCurStates()->m_GeneralState; pState->SetBlendType(FXDIB_BLEND_NORMAL); pState->SetStrokeAlpha(1.0f); diff --git a/core/fpdfapi/page/cpdf_form.cpp b/core/fpdfapi/page/cpdf_form.cpp index 12403a4cc9..e4334016b4 100644 --- a/core/fpdfapi/page/cpdf_form.cpp +++ b/core/fpdfapi/page/cpdf_form.cpp @@ -26,7 +26,7 @@ CPDF_Form::CPDF_Form(CPDF_Document* pDoc, m_pResources = pParentResources; if (!m_pResources) m_pResources = pPageResources; - m_Transparency = 0; + m_iTransparency = 0; LoadTransInfo(); } diff --git a/core/fpdfapi/page/cpdf_page.cpp b/core/fpdfapi/page/cpdf_page.cpp index 148b30a51c..3a7f8b5805 100644 --- a/core/fpdfapi/page/cpdf_page.cpp +++ b/core/fpdfapi/page/cpdf_page.cpp @@ -68,7 +68,7 @@ CPDF_Page::CPDF_Page(CPDF_Document* pDocument, break; } - m_Transparency = PDFTRANS_ISOLATED; + m_iTransparency = PDFTRANS_ISOLATED; LoadTransInfo(); } diff --git a/core/fpdfapi/page/cpdf_pageobjectholder.cpp b/core/fpdfapi/page/cpdf_pageobjectholder.cpp index 98950e6ff7..5de911513f 100644 --- a/core/fpdfapi/page/cpdf_pageobjectholder.cpp +++ b/core/fpdfapi/page/cpdf_pageobjectholder.cpp @@ -20,7 +20,7 @@ CPDF_PageObjectHolder::CPDF_PageObjectHolder(CPDF_Document* pDoc, m_pDocument(pDoc), m_pPageResources(nullptr), m_pResources(nullptr), - m_Transparency(0), + m_iTransparency(0), m_bBackgroundAlphaNeeded(false), m_ParseState(CONTENT_NOT_PARSED) {} @@ -81,11 +81,11 @@ void CPDF_PageObjectHolder::LoadTransInfo() { if (pGroup->GetStringFor("S") != "Transparency") { return; } - m_Transparency |= PDFTRANS_GROUP; + m_iTransparency |= PDFTRANS_GROUP; if (pGroup->GetIntegerFor("I")) { - m_Transparency |= PDFTRANS_ISOLATED; + m_iTransparency |= PDFTRANS_ISOLATED; } if (pGroup->GetIntegerFor("K")) { - m_Transparency |= PDFTRANS_KNOCKOUT; + m_iTransparency |= PDFTRANS_KNOCKOUT; } } diff --git a/core/fpdfapi/page/cpdf_pageobjectholder.h b/core/fpdfapi/page/cpdf_pageobjectholder.h index b7386f2c93..1a8b1aae38 100644 --- a/core/fpdfapi/page/cpdf_pageobjectholder.h +++ b/core/fpdfapi/page/cpdf_pageobjectholder.h @@ -79,7 +79,7 @@ class CPDF_PageObjectHolder { std::map<GraphicsData, ByteString> m_GraphicsMap; std::map<FontData, ByteString> m_FontsMap; CFX_FloatRect m_BBox; - int m_Transparency; + int m_iTransparency; protected: enum ParseState { CONTENT_NOT_PARSED, CONTENT_PARSING, CONTENT_PARSED }; |