diff options
author | Lei Zhang <thestig@chromium.org> | 2015-12-14 15:50:28 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-12-14 15:50:28 -0800 |
commit | 1956a174020686f91cd3b34294e91f4560fe45aa (patch) | |
tree | 25b21d226c9031e1a0748ddcc455214185585668 /core/src/fpdfapi/fpdf_render/fpdf_render.cpp | |
parent | 1407c979a3ba8599546468d461f5403f317bddd3 (diff) | |
download | pdfium-1956a174020686f91cd3b34294e91f4560fe45aa.tar.xz |
Remove FX_BSTRC.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1521563002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_render/fpdf_render.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp index faf6afe7f6..d7c3b6e6e8 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp @@ -444,8 +444,7 @@ void CPDF_RenderStatus::DrawObjWithBackground(const CPDF_PageObject* pObj, if (pObj->m_Type == PDFPAGE_FORM) { CPDF_FormObject* pFormObj = (CPDF_FormObject*)pObj; if (pFormObj->m_pForm && pFormObj->m_pForm->m_pFormDict) { - pFormResource = - pFormObj->m_pForm->m_pFormDict->GetDict(FX_BSTRC("Resources")); + pFormResource = pFormObj->m_pForm->m_pFormDict->GetDict("Resources"); } } CPDF_RenderStatus status; @@ -457,8 +456,7 @@ void CPDF_RenderStatus::DrawObjWithBackground(const CPDF_PageObject* pObj, } FX_BOOL CPDF_RenderStatus::ProcessForm(CPDF_FormObject* pFormObj, const CFX_Matrix* pObj2Device) { - CPDF_Dictionary* pOC = - pFormObj->m_pForm->m_pFormDict->GetDict(FX_BSTRC("OC")); + CPDF_Dictionary* pOC = pFormObj->m_pForm->m_pFormDict->GetDict("OC"); if (pOC && m_Options.m_pOCContext && !m_Options.m_pOCContext->CheckOCGVisible(pOC)) { return TRUE; @@ -467,7 +465,7 @@ FX_BOOL CPDF_RenderStatus::ProcessForm(CPDF_FormObject* pFormObj, matrix.Concat(*pObj2Device); CPDF_Dictionary* pResources = NULL; if (pFormObj->m_pForm && pFormObj->m_pForm->m_pFormDict) { - pResources = pFormObj->m_pForm->m_pFormDict->GetDict(FX_BSTRC("Resources")); + pResources = pFormObj->m_pForm->m_pFormDict->GetDict("Resources"); } CPDF_RenderStatus status; status.Initialize(m_pContext, m_pDevice, NULL, m_pStopObj, this, pFormObj, @@ -731,9 +729,7 @@ FX_BOOL CPDF_RenderStatus::ProcessTransparency(const CPDF_PageObject* pPageObj, pGeneralState ? ToDictionary(pGeneralState->m_pSoftMask) : NULL; if (pSMaskDict) { if (pPageObj->m_Type == PDFPAGE_IMAGE && - ((CPDF_ImageObject*)pPageObj) - ->m_pImage->GetDict() - ->KeyExist(FX_BSTRC("SMask"))) { + ((CPDF_ImageObject*)pPageObj)->m_pImage->GetDict()->KeyExist("SMask")) { pSMaskDict = NULL; } } @@ -775,7 +771,7 @@ FX_BOOL CPDF_RenderStatus::ProcessTransparency(const CPDF_PageObject* pPageObj, CPDF_Object* pCSObj = ((CPDF_ImageObject*)pPageObj) ->m_pImage->GetStream() ->GetDict() - ->GetElementValue(FX_BSTRC("ColorSpace")); + ->GetElementValue("ColorSpace"); CPDF_ColorSpace* pColorSpace = pDocument->LoadColorSpace(pCSObj, pPageResources); if (pColorSpace) { @@ -1414,7 +1410,7 @@ FX_BOOL IPDF_OCContext::CheckObjectVisible(const CPDF_PageObject* pObj) { int nItems = pData->CountItems(); for (int i = 0; i < nItems; i++) { CPDF_ContentMarkItem& item = pData->GetItem(i); - if (item.GetName() == FX_BSTRC("OC") && + if (item.GetName() == "OC" && item.GetParamType() == CPDF_ContentMarkItem::PropertiesDict) { CPDF_Dictionary* pOCG = ToDictionary(static_cast<CPDF_Object*>(item.GetParam())); |