From f1be1e87045da36b52326fb269f7006670c0c9ab Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 2 Nov 2017 19:50:58 +0000 Subject: 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 Commit-Queue: Lei Zhang --- core/fpdfapi/page/cpdf_contentparser.cpp | 2 +- core/fpdfapi/page/cpdf_form.cpp | 2 +- core/fpdfapi/page/cpdf_page.cpp | 2 +- core/fpdfapi/page/cpdf_pageobjectholder.cpp | 8 ++--- core/fpdfapi/page/cpdf_pageobjectholder.h | 2 +- core/fpdfapi/render/cpdf_progressiverenderer.cpp | 2 +- core/fpdfapi/render/cpdf_rendercontext.cpp | 4 +-- core/fpdfapi/render/cpdf_renderstatus.cpp | 38 ++++++++++++------------ core/fpdfapi/render/cpdf_renderstatus.h | 4 +-- core/fxge/dib/cfx_scanlinecompositor.cpp | 12 ++++---- core/fxge/dib/cfx_scanlinecompositor.h | 2 +- fpdfsdk/fpdfeditpage.cpp | 2 +- xfa/fxfa/cxfa_ffwidget.cpp | 8 ++--- 13 files changed, 44 insertions(+), 44 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 m_GraphicsMap; std::map m_FontsMap; CFX_FloatRect m_BBox; - int m_Transparency; + int m_iTransparency; protected: enum ParseState { CONTENT_NOT_PARSED, CONTENT_PARSING, CONTENT_PARSED }; diff --git a/core/fpdfapi/render/cpdf_progressiverenderer.cpp b/core/fpdfapi/render/cpdf_progressiverenderer.cpp index 603c951856..e509a25440 100644 --- a/core/fpdfapi/render/cpdf_progressiverenderer.cpp +++ b/core/fpdfapi/render/cpdf_progressiverenderer.cpp @@ -57,7 +57,7 @@ void CPDF_ProgressiveRenderer::Continue(IFX_PauseIndicator* pPause) { m_pRenderStatus = pdfium::MakeUnique(); m_pRenderStatus->Initialize( m_pContext.Get(), m_pDevice.Get(), nullptr, nullptr, nullptr, nullptr, - m_pOptions, m_pCurrentLayer->m_pObjectHolder->m_Transparency, false, + m_pOptions, m_pCurrentLayer->m_pObjectHolder->m_iTransparency, false, nullptr); m_pDevice->SaveState(); m_ClipRect = m_pCurrentLayer->m_Matrix.GetInverse().TransformRect( diff --git a/core/fpdfapi/render/cpdf_rendercontext.cpp b/core/fpdfapi/render/cpdf_rendercontext.cpp index bba24d683c..ef6d9b3d4d 100644 --- a/core/fpdfapi/render/cpdf_rendercontext.cpp +++ b/core/fpdfapi/render/cpdf_rendercontext.cpp @@ -69,12 +69,12 @@ void CPDF_RenderContext::Render(CFX_RenderDevice* pDevice, CFX_Matrix FinalMatrix = layer.m_Matrix; FinalMatrix.Concat(*pLastMatrix); status.Initialize(this, pDevice, pLastMatrix, pStopObj, nullptr, nullptr, - pOptions, layer.m_pObjectHolder->m_Transparency, false, + pOptions, layer.m_pObjectHolder->m_iTransparency, false, nullptr); status.RenderObjectList(layer.m_pObjectHolder.Get(), &FinalMatrix); } else { status.Initialize(this, pDevice, nullptr, pStopObj, nullptr, nullptr, - pOptions, layer.m_pObjectHolder->m_Transparency, false, + pOptions, layer.m_pObjectHolder->m_iTransparency, false, nullptr); status.RenderObjectList(layer.m_pObjectHolder.Get(), &layer.m_Matrix); } diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp index 0bf03d27c9..df5a41db3a 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.cpp +++ b/core/fpdfapi/render/cpdf_renderstatus.cpp @@ -978,7 +978,7 @@ CPDF_RenderStatus::CPDF_RenderStatus() m_pCurObj(nullptr), m_pStopObj(nullptr), m_bPrint(false), - m_Transparency(0), + m_iTransparency(0), m_bDropObjects(false), m_bStdCS(false), m_GroupFamily(0), @@ -1042,7 +1042,7 @@ bool CPDF_RenderStatus::Initialize(CPDF_RenderContext* pContext, m_InitialStates.DefaultStates(); } m_pImageRenderer.reset(); - m_Transparency = transparency; + m_iTransparency = transparency; return true; } @@ -1245,7 +1245,7 @@ void CPDF_RenderStatus::DrawObjWithBackground(CPDF_PageObject* pObj, } CPDF_RenderStatus status; status.Initialize(m_pContext.Get(), buffer.GetDevice(), buffer.GetMatrix(), - nullptr, nullptr, nullptr, &m_Options, m_Transparency, + nullptr, nullptr, nullptr, &m_Options, m_iTransparency, m_bDropObjects, pFormResource); status.RenderSingleObject(pObj, &matrix); buffer.OutputToDevice(); @@ -1269,7 +1269,7 @@ bool CPDF_RenderStatus::ProcessForm(const CPDF_FormObject* pFormObj, } CPDF_RenderStatus status; status.Initialize(m_pContext.Get(), m_pDevice, nullptr, m_pStopObj, this, - pFormObj, &m_Options, m_Transparency, m_bDropObjects, + pFormObj, &m_Options, m_iTransparency, m_bDropObjects, pResources, false); status.m_curBlend = m_curBlend; { @@ -1485,13 +1485,13 @@ bool CPDF_RenderStatus::ProcessTransparency(CPDF_PageObject* pPageObj, } CPDF_Dictionary* pFormResource = nullptr; float group_alpha = 1.0f; - int Transparency = m_Transparency; + int iTransparency = m_iTransparency; bool bGroupTransparent = false; if (pPageObj->IsForm()) { const CPDF_FormObject* pFormObj = pPageObj->AsForm(); group_alpha = pFormObj->m_GeneralState.GetFillAlpha(); - Transparency = pFormObj->m_pForm->m_Transparency; - bGroupTransparent = !!(Transparency & PDFTRANS_ISOLATED); + iTransparency = pFormObj->m_pForm->m_iTransparency; + bGroupTransparent = !!(iTransparency & PDFTRANS_ISOLATED); if (pFormObj->m_pForm->m_pFormDict) { pFormResource = pFormObj->m_pForm->m_pFormDict->GetDictFor("Resources"); } @@ -1533,11 +1533,11 @@ bool CPDF_RenderStatus::ProcessTransparency(CPDF_PageObject* pPageObj, !bTextClip && !bGroupTransparent) { return false; } - bool isolated = !!(Transparency & PDFTRANS_ISOLATED); + bool isolated = !!(iTransparency & PDFTRANS_ISOLATED); if (m_bPrint) { bool bRet = false; int rendCaps = m_pDevice->GetRenderCaps(); - if (!((Transparency & PDFTRANS_ISOLATED) || pSMaskDict || bTextClip) && + if (!((iTransparency & PDFTRANS_ISOLATED) || pSMaskDict || bTextClip) && (rendCaps & FXRC_BLEND_MODE)) { int oldBlend = m_curBlend; m_curBlend = blend_type; @@ -1622,19 +1622,19 @@ bool CPDF_RenderStatus::ProcessTransparency(CPDF_PageObject* pPageObj, pTextMask.Reset(); } int32_t blitAlpha = 255; - if (Transparency & PDFTRANS_GROUP && group_alpha != 1.0f) { + if (iTransparency & PDFTRANS_GROUP && group_alpha != 1.0f) { blitAlpha = (int32_t)(group_alpha * 255); #ifndef _SKIA_SUPPORT_ bitmap->MultiplyAlpha(blitAlpha); blitAlpha = 255; #endif } - Transparency = m_Transparency; + iTransparency = m_iTransparency; if (pPageObj->IsForm()) { - Transparency |= PDFTRANS_GROUP; + iTransparency |= PDFTRANS_GROUP; } CompositeDIBitmap(bitmap, rect.left, rect.top, 0, blitAlpha, blend_type, - Transparency); + iTransparency); #if defined _SKIA_SUPPORT_ DebugVerifyDeviceIsPreMultiplied(); #endif @@ -1898,7 +1898,7 @@ bool CPDF_RenderStatus::ProcessType3Text(CPDF_TextObject* textobj, CPDF_RenderStatus status; status.Initialize(m_pContext.Get(), m_pDevice, nullptr, nullptr, this, pStates.get(), &options, - pType3Char->m_pForm->m_Transparency, m_bDropObjects, + pType3Char->m_pForm->m_iTransparency, m_bDropObjects, pFormResource, false, pType3Char, fill_argb); status.m_Type3FontCache = m_Type3FontCache; status.m_Type3FontCache.push_back(pType3Font); @@ -1919,7 +1919,7 @@ bool CPDF_RenderStatus::ProcessType3Text(CPDF_TextObject* textobj, CPDF_RenderStatus status; status.Initialize(m_pContext.Get(), &bitmap_device, nullptr, nullptr, this, pStates.get(), &options, - pType3Char->m_pForm->m_Transparency, m_bDropObjects, + pType3Char->m_pForm->m_iTransparency, m_bDropObjects, pFormResource, false, pType3Char, fill_argb); status.m_Type3FontCache = m_Type3FontCache; status.m_Type3FontCache.push_back(pType3Font); @@ -2284,7 +2284,7 @@ void CPDF_RenderStatus::DrawTilingPattern(CPDF_TilingPattern* pPattern, CPDF_RenderStatus status; status.Initialize(m_pContext.Get(), m_pDevice, nullptr, nullptr, this, pStates.get(), &m_Options, - pPattern->form()->m_Transparency, m_bDropObjects, + pPattern->form()->m_iTransparency, m_bDropObjects, pFormResource); status.RenderObjectList(pPattern->form(), &matrix); } @@ -2437,7 +2437,7 @@ void CPDF_RenderStatus::CompositeDIBitmap( FX_ARGB mask_argb, int bitmap_alpha, int blend_mode, - int Transparency) { + int iTransparency) { if (!pDIBitmap) return; @@ -2471,8 +2471,8 @@ void CPDF_RenderStatus::CompositeDIBitmap( } } } - bool bIsolated = !!(Transparency & PDFTRANS_ISOLATED); - bool bGroup = !!(Transparency & PDFTRANS_GROUP); + bool bIsolated = !!(iTransparency & PDFTRANS_ISOLATED); + bool bGroup = !!(iTransparency & PDFTRANS_GROUP); bool bBackAlphaRequired = blend_mode && bIsolated && !m_bDropObjects; bool bGetBackGround = ((m_pDevice->GetRenderCaps() & FXRC_ALPHA_OUTPUT)) || diff --git a/core/fpdfapi/render/cpdf_renderstatus.h b/core/fpdfapi/render/cpdf_renderstatus.h index e0045afd85..1dbdf5bbd3 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.h +++ b/core/fpdfapi/render/cpdf_renderstatus.h @@ -96,7 +96,7 @@ class CPDF_RenderStatus { FX_ARGB mask_argb, int bitmap_alpha, int blend_mode, - int bIsolated); + int iTransparency); private: bool ProcessTransparency(CPDF_PageObject* PageObj, @@ -176,7 +176,7 @@ class CPDF_RenderStatus { CPDF_GraphicStates m_InitialStates; std::unique_ptr m_pImageRenderer; bool m_bPrint; - int m_Transparency; + int m_iTransparency; bool m_bDropObjects; bool m_bStdCS; uint32_t m_GroupFamily; diff --git a/core/fxge/dib/cfx_scanlinecompositor.cpp b/core/fxge/dib/cfx_scanlinecompositor.cpp index b9c51f6122..a1254e2116 100644 --- a/core/fxge/dib/cfx_scanlinecompositor.cpp +++ b/core/fxge/dib/cfx_scanlinecompositor.cpp @@ -2846,12 +2846,12 @@ bool CFX_ScanlineCompositor::Init(FXDIB_Format dest_format, return true; InitSourcePalette(src_format, dest_format, pSrcPalette); - m_Transparency = + m_iTransparency = (dest_format == FXDIB_Argb ? 1 : 0) + (dest_format & 0x0200 ? 2 : 0) + (dest_format & 0x0400 ? 4 : 0) + ((src_format & 0xff) == 1 ? 8 : 0); return true; } - m_Transparency = + m_iTransparency = (src_format & 0x0200 ? 0 : 1) + (dest_format & 0x0200 ? 0 : 2) + (blend_type == FXDIB_BLEND_NORMAL ? 4 : 0) + (bClip ? 8 : 0) + (src_format & 0x0400 ? 16 : 0) + (dest_format & 0x0400 ? 32 : 0); @@ -3001,7 +3001,7 @@ void CFX_ScanlineCompositor::CompositeRgbBitmapLine( int src_Bpp = (m_SrcFormat & 0xff) >> 3; int dest_Bpp = (m_DestFormat & 0xff) >> 3; if (m_bRgbByteOrder) { - switch (m_Transparency) { + switch (m_iTransparency) { case 0: case 4: case 8: @@ -3097,7 +3097,7 @@ void CFX_ScanlineCompositor::CompositeRgbBitmapLine( } } } else { - switch (m_Transparency) { + switch (m_iTransparency) { case 0: case 4: case 8: @@ -3194,7 +3194,7 @@ void CFX_ScanlineCompositor::CompositePalBitmapLine( return; } if ((m_DestFormat & 0xff) == 8) { - if (m_Transparency & 8) { + if (m_iTransparency & 8) { if (m_DestFormat & 0x0200) { CompositeRow_1bppPal2Graya( dest_scan, src_scan, src_left, @@ -3219,7 +3219,7 @@ void CFX_ScanlineCompositor::CompositePalBitmapLine( m_BlendType, clip_scan, src_extra_alpha); } } else { - switch (m_Transparency) { + switch (m_iTransparency) { case 1 + 2: CompositeRow_8bppRgb2Argb_NoBlend(dest_scan, src_scan, width, m_pSrcPalette.get(), clip_scan, diff --git a/core/fxge/dib/cfx_scanlinecompositor.h b/core/fxge/dib/cfx_scanlinecompositor.h index bc20cc97ab..75ab578128 100644 --- a/core/fxge/dib/cfx_scanlinecompositor.h +++ b/core/fxge/dib/cfx_scanlinecompositor.h @@ -62,7 +62,7 @@ class CFX_ScanlineCompositor { void InitSourceMask(int alpha_flag, uint32_t mask_color); - int m_Transparency; + int m_iTransparency; FXDIB_Format m_SrcFormat; FXDIB_Format m_DestFormat; std::unique_ptr m_pSrcPalette; diff --git a/fpdfsdk/fpdfeditpage.cpp b/fpdfsdk/fpdfeditpage.cpp index a1f2f396a5..db726b74f0 100644 --- a/fpdfsdk/fpdfeditpage.cpp +++ b/fpdfsdk/fpdfeditpage.cpp @@ -235,7 +235,7 @@ FPDFPageObj_HasTransparency(FPDF_PAGEOBJECT pageObject) { if (pPageObj->IsForm()) { const CPDF_Form* pForm = pPageObj->AsForm()->form(); if (pForm) { - int trans = pForm->m_Transparency; + int trans = pForm->m_iTransparency; if ((trans & PDFTRANS_ISOLATED) || (trans & PDFTRANS_GROUP)) return true; } diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp index 77f1ac5006..6971d03df0 100644 --- a/xfa/fxfa/cxfa_ffwidget.cpp +++ b/xfa/fxfa/cxfa_ffwidget.cpp @@ -1441,7 +1441,7 @@ class CXFA_ImageRenderer { FX_ARGB mask_argb, int bitmap_alpha, int blend_mode, - int Transparency); + int iTransparency); CFX_RenderDevice* m_pDevice; int m_Status; @@ -1606,12 +1606,12 @@ void CXFA_ImageRenderer::CompositeDIBitmap( FX_ARGB mask_argb, int bitmap_alpha, int blend_mode, - int Transparency) { + int iTransparency) { if (!pDIBitmap) { return; } - bool bIsolated = !!(Transparency & PDFTRANS_ISOLATED); - bool bGroup = !!(Transparency & PDFTRANS_GROUP); + bool bIsolated = !!(iTransparency & PDFTRANS_ISOLATED); + bool bGroup = !!(iTransparency & PDFTRANS_GROUP); if (blend_mode == FXDIB_BLEND_NORMAL) { if (!pDIBitmap->IsAlphaMask()) { if (bitmap_alpha < 255) { -- cgit v1.2.3