From 8e5cd19d174f259bfda5f7a9699b08fdc4289b56 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 26 Jan 2016 13:20:26 -0800 Subject: Merge to XFA: War on #defines, part 1. Contains additional XFA-specific changes. Original Review URL: https://codereview.chromium.org/1632143002 . (cherry picked from commit 66a9dc9dd65ed2b9c7ede448d046b770140f16d5) R=thestig@chromium.org Review URL: https://codereview.chromium.org/1636503006 . --- core/src/fpdftext/fpdf_text.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/fpdftext/fpdf_text.cpp') diff --git a/core/src/fpdftext/fpdf_text.cpp b/core/src/fpdftext/fpdf_text.cpp index 4aea797c39..3871d25177 100644 --- a/core/src/fpdftext/fpdf_text.cpp +++ b/core/src/fpdftext/fpdf_text.cpp @@ -48,7 +48,7 @@ CTextPage::~CTextPage() { } } void CTextPage::ProcessObject(CPDF_PageObject* pObject) { - if (pObject->m_Type != PDFPAGE_TEXT) { + if (pObject->m_Type != CPDF_PageObject::TEXT) { return; } CPDF_TextObject* pText = (CPDF_TextObject*)pObject; @@ -682,7 +682,7 @@ static void CheckRotate(CPDF_Page& page, CFX_FloatRect& page_bbox) { FX_POSITION pos = page.GetFirstObjectPosition(); while (pos) { CPDF_PageObject* pObj = page.GetNextObject(pos); - if (pObj->m_Type != PDFPAGE_TEXT) { + if (pObj->m_Type != CPDF_PageObject::TEXT) { continue; } total_count++; -- cgit v1.2.3