Merge to XFA: War on #defines, part 1.

core/src/fpdftext/fpdf_text.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <cctype>
 #include <cwctype>
 #include <memory>
 
@@ skipping 30 matching lines @@
 CTextPage::~CTextPage() {
   int i;
   for (i = 0; i < m_BaseLines.GetSize(); i++) {
     delete m_BaseLines.GetAt(i);
   }
   for (i = 0; i < m_TextColumns.GetSize(); i++) {
     delete m_TextColumns.GetAt(i);
   }
 }
 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;
   CPDF_Font* pFont = pText->m_TextState.GetFont();
   int count = pText->CountItems();
   FX_FLOAT* pPosArray = FX_Alloc2D(FX_FLOAT, count, 2);
   pText->CalcCharPos(pPosArray);
 
   FX_FLOAT fontsize_h = pText->m_TextState.GetFontSizeH();
   FX_FLOAT fontsize_v = pText->m_TextState.GetFontSizeV();
@@ skipping 613 matching lines @@
     width += pText->m_Right - pText->m_Left;
     minchars += pText->m_Text.GetLength() + 1;
   }
 }
 #define PI 3.1415926535897932384626433832795
 static void CheckRotate(CPDF_Page& page, CFX_FloatRect& page_bbox) {
   int total_count = 0, rotated_count[3] = {0, 0, 0};
   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++;
     CPDF_TextObject* pText = (CPDF_TextObject*)pObj;
     FX_FLOAT angle = pText->m_TextState.GetBaselineAngle();
     if (angle == 0.0) {
       continue;
     }
     int degree = (int)(angle * 180 / PI + 0.5);
     if (degree % 90) {
@@ skipping 84 matching lines @@
                                FX_DWORD flags) {
   buffer.EstimateSize(0, 10240);
   CPDF_Page page;
   page.Load(pDoc, pPage);
   CPDF_ParseOptions options;
   options.m_bTextOnly = TRUE;
   options.m_bSeparateForm = FALSE;
   page.ParseContent(&options);
   GetTextStream_Unicode(buffer, &page, TRUE, NULL);
 }