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

core/src/fpdfapi/fpdf_page/fpdf_page_parser.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 "core/src/fpdfapi/fpdf_page/pageint.h"
 
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
@@ skipping 191 matching lines @@
   return index;
 }
 
 void CPDF_StreamContentParser::AddNameParam(const FX_CHAR* name, int len) {
   int index = GetNextParamPos();
   if (len > 32) {
     m_ParamBuf1[index].m_Type = 0;
     m_ParamBuf1[index].m_pObject =
         new CPDF_Name(PDF_NameDecode(CFX_ByteStringC(name, len)));
   } else {
-    m_ParamBuf1[index].m_Type = PDFOBJ_NAME;
+    m_ParamBuf1[index].m_Type = CPDF_Object::NAME;
     if (!FXSYS_memchr(name, '#', len)) {
       FXSYS_memcpy(m_ParamBuf1[index].m_Name.m_Buffer, name, len);
       m_ParamBuf1[index].m_Name.m_Len = len;
     } else {
       CFX_ByteString str = PDF_NameDecode(CFX_ByteStringC(name, len));
       FXSYS_memcpy(m_ParamBuf1[index].m_Name.m_Buffer, str.c_str(),
                    str.GetLength());
       m_ParamBuf1[index].m_Name.m_Len = str.GetLength();
     }
   }
 }
 
 void CPDF_StreamContentParser::AddNumberParam(const FX_CHAR* str, int len) {
   int index = GetNextParamPos();
-  m_ParamBuf1[index].m_Type = PDFOBJ_NUMBER;
+  m_ParamBuf1[index].m_Type = CPDF_Object::NUMBER;
   FX_atonum(CFX_ByteStringC(str, len), m_ParamBuf1[index].m_Number.m_bInteger,
             &m_ParamBuf1[index].m_Number.m_Integer);
 }
 void CPDF_StreamContentParser::AddObjectParam(CPDF_Object* pObj) {
   int index = GetNextParamPos();
   m_ParamBuf1[index].m_Type = 0;
   m_ParamBuf1[index].m_pObject = pObj;
 }
 void CPDF_StreamContentParser::ClearAllParams() {
   FX_DWORD index = m_ParamStartPos;
@@ skipping 13 matching lines @@
 
 CPDF_Object* CPDF_StreamContentParser::GetObject(FX_DWORD index) {
   if (index >= m_ParamCount) {
     return NULL;
   }
   int real_index = m_ParamStartPos + m_ParamCount - index - 1;
   if (real_index >= PARAM_BUF_SIZE) {
     real_index -= PARAM_BUF_SIZE;
   }
   ContentParam& param = m_ParamBuf1[real_index];
-  if (param.m_Type == PDFOBJ_NUMBER) {
+  if (param.m_Type == CPDF_Object::NUMBER) {
     CPDF_Number* pNumber = param.m_Number.m_bInteger
                                ? new CPDF_Number(param.m_Number.m_Integer)
                                : new CPDF_Number(param.m_Number.m_Float);
 
     param.m_Type = 0;
     param.m_pObject = pNumber;
     return pNumber;
   }
-  if (param.m_Type == PDFOBJ_NAME) {
+  if (param.m_Type == CPDF_Object::NAME) {
     CPDF_Name* pName = new CPDF_Name(
         CFX_ByteString(param.m_Name.m_Buffer, param.m_Name.m_Len));
     param.m_Type = 0;
     param.m_pObject = pName;
     return pName;
   }
   if (param.m_Type == 0) {
     return param.m_pObject;
   }
   ASSERT(FALSE);
   return NULL;
 }
 
 CFX_ByteString CPDF_StreamContentParser::GetString(FX_DWORD index) {
   if (index >= m_ParamCount) {
     return CFX_ByteString();
   }
   int real_index = m_ParamStartPos + m_ParamCount - index - 1;
   if (real_index >= PARAM_BUF_SIZE) {
     real_index -= PARAM_BUF_SIZE;
   }
   ContentParam& param = m_ParamBuf1[real_index];
-  if (param.m_Type == PDFOBJ_NAME) {
+  if (param.m_Type == CPDF_Object::NAME) {
     return CFX_ByteString(param.m_Name.m_Buffer, param.m_Name.m_Len);
   }
   if (param.m_Type == 0 && param.m_pObject) {
     return param.m_pObject->GetString();
   }
   return CFX_ByteString();
 }
 
 FX_FLOAT CPDF_StreamContentParser::GetNumber(FX_DWORD index) {
   if (index >= m_ParamCount) {
     return 0;
   }
   int real_index = m_ParamStartPos + m_ParamCount - index - 1;
   if (real_index >= PARAM_BUF_SIZE) {
     real_index -= PARAM_BUF_SIZE;
   }
   ContentParam& param = m_ParamBuf1[real_index];
-  if (param.m_Type == PDFOBJ_NUMBER) {
+  if (param.m_Type == CPDF_Object::NUMBER) {
     return param.m_Number.m_bInteger ? (FX_FLOAT)param.m_Number.m_Integer
                                      : param.m_Number.m_Float;
   }
   if (param.m_Type == 0 && param.m_pObject) {
     return param.m_pObject->GetNumber();
   }
   return 0;
 }
 
 FX_FLOAT CPDF_StreamContentParser::GetNumber16(FX_DWORD index) {
@@ skipping 1430 matching lines @@
     }
     if (!bProcessed) {
       m_pSyntax->SetPos(last_pos);
       return;
     }
   }
 }
 
 void PDF_ReplaceAbbr(CPDF_Object* pObj) {
   switch (pObj->GetType()) {
-    case PDFOBJ_DICTIONARY: {
+    case CPDF_Object::DICTIONARY: {
       CPDF_Dictionary* pDict = pObj->AsDictionary();
       std::vector<AbbrReplacementOp> replacements;
       for (const auto& it : *pDict) {
         CFX_ByteString key = it.first;
         CPDF_Object* value = it.second;
         CFX_ByteStringC fullname = PDF_FindFullName(
             PDF_InlineKeyAbbr, FX_ArraySize(PDF_InlineKeyAbbr), key);
         if (!fullname.IsEmpty()) {
           AbbrReplacementOp op;
           op.is_replace_key = true;
@@ skipping 19 matching lines @@
         }
       }
       for (const auto& op : replacements) {
         if (op.is_replace_key)
           pDict->ReplaceKey(op.key, op.replacement);
         else
           pDict->SetAtName(op.key, op.replacement);
       }
       break;
     }
-    case PDFOBJ_ARRAY: {
+    case CPDF_Object::ARRAY: {
       CPDF_Array* pArray = pObj->AsArray();
       for (FX_DWORD i = 0; i < pArray->GetCount(); i++) {
         CPDF_Object* pElement = pArray->GetElement(i);
         if (pElement->IsName()) {
           CFX_ByteString name = pElement->GetString();
           CFX_ByteStringC fullname = PDF_FindFullName(
               PDF_InlineValueAbbr, FX_ArraySize(PDF_InlineValueAbbr), name);
           if (!fullname.IsEmpty()) {
             pArray->SetAt(i, new CPDF_Name(fullname));
           }
         } else {
           PDF_ReplaceAbbr(pElement);
         }
       }
       break;
     }
+    default:
+      break;
   }
 }