diff options
author | Lei Zhang <thestig@chromium.org> | 2015-12-14 16:58:33 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-12-14 16:58:33 -0800 |
commit | d983b09c3ae29a97cba8e9ec9c6351545f6087ee (patch) | |
tree | 5641a4bc6eddaa8069904c29c3e3897043411646 /core/src/fpdfapi/fpdf_page/fpdf_page.cpp | |
parent | f86d3f946e2f1977c7eaea01dcb9d7ecb3064cd1 (diff) | |
download | pdfium-d983b09c3ae29a97cba8e9ec9c6351545f6087ee.tar.xz |
Merge to XFA: Remove FX_BSTRC.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1521563002 .
(cherry picked from commit 1956a174020686f91cd3b34294e91f4560fe45aa)
Review URL: https://codereview.chromium.org/1526823002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp index 45b796ce86..f37dd770ca 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp @@ -761,18 +761,18 @@ void CPDF_PageObjects::LoadTransInfo() { if (m_pFormDict == NULL) { return; } - CPDF_Dictionary* pGroup = m_pFormDict->GetDict(FX_BSTRC("Group")); + CPDF_Dictionary* pGroup = m_pFormDict->GetDict("Group"); if (pGroup == NULL) { return; } - if (pGroup->GetString(FX_BSTRC("S")) != FX_BSTRC("Transparency")) { + if (pGroup->GetString("S") != "Transparency") { return; } m_Transparency |= PDFTRANS_GROUP; - if (pGroup->GetInteger(FX_BSTRC("I"))) { + if (pGroup->GetInteger("I")) { m_Transparency |= PDFTRANS_ISOLATED; } - if (pGroup->GetInteger(FX_BSTRC("K"))) { + if (pGroup->GetInteger("K")) { m_Transparency |= PDFTRANS_KNOCKOUT; } } @@ -805,10 +805,10 @@ void CPDF_Page::Load(CPDF_Document* pDocument, m_pPageResources = m_pResources = NULL; return; } - CPDF_Object* pageAttr = GetPageAttr(FX_BSTRC("Resources")); + CPDF_Object* pageAttr = GetPageAttr("Resources"); m_pResources = pageAttr ? pageAttr->GetDict() : NULL; m_pPageResources = m_pResources; - CPDF_Object* pRotate = GetPageAttr(FX_BSTRC("Rotate")); + CPDF_Object* pRotate = GetPageAttr("Rotate"); int rotate = 0; if (pRotate) { rotate = pRotate->GetInteger() / 90 % 4; @@ -816,7 +816,7 @@ void CPDF_Page::Load(CPDF_Document* pDocument, if (rotate < 0) { rotate += 4; } - CPDF_Array* pMediaBox = ToArray(GetPageAttr(FX_BSTRC("MediaBox"))); + CPDF_Array* pMediaBox = ToArray(GetPageAttr("MediaBox")); CFX_FloatRect mediabox; if (pMediaBox) { mediabox = pMediaBox->GetRect(); @@ -826,7 +826,7 @@ void CPDF_Page::Load(CPDF_Document* pDocument, mediabox = CFX_FloatRect(0, 0, 612, 792); } - CPDF_Array* pCropBox = ToArray(GetPageAttr(FX_BSTRC("CropBox"))); + CPDF_Array* pCropBox = ToArray(GetPageAttr("CropBox")); if (pCropBox) { m_BBox = pCropBox->GetRect(); m_BBox.Normalize(); @@ -889,7 +889,7 @@ CPDF_Object* FPDFAPI_GetPageAttr(CPDF_Dictionary* pPageDict, if (pObj) { return pObj; } - CPDF_Dictionary* pParent = pPageDict->GetDict(FX_BSTRC("Parent")); + CPDF_Dictionary* pParent = pPageDict->GetDict("Parent"); if (!pParent || pParent == pPageDict) { return NULL; } @@ -910,7 +910,7 @@ CPDF_Form::CPDF_Form(CPDF_Document* pDoc, m_pDocument = pDoc; m_pFormStream = pFormStream; m_pFormDict = pFormStream ? pFormStream->GetDict() : NULL; - m_pResources = m_pFormDict->GetDict(FX_BSTRC("Resources")); + m_pResources = m_pFormDict->GetDict("Resources"); m_pPageResources = pPageResources; if (m_pResources == NULL) { m_pResources = pParentResources; |