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

core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.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/include/fpdfapi/fpdf_parser.h"
 
 #include "core/include/fxcrt/fx_ext.h"
 
@@ skipping 320 matching lines @@
   dest_buf[dest_len] = 0;
   res.ReleaseBuffer();
   return res;
 }
 CFX_ByteTextBuf& operator<<(CFX_ByteTextBuf& buf, const CPDF_Object* pObj) {
   if (!pObj) {
     buf << " null";
     return buf;
   }
   switch (pObj->GetType()) {
-    case PDFOBJ_NULL:
+    case CPDF_Object::NULLOBJ:
       buf << " null";
       break;
-    case PDFOBJ_BOOLEAN:
-    case PDFOBJ_NUMBER:
+    case CPDF_Object::BOOLEAN:
+    case CPDF_Object::NUMBER:
       buf << " " << pObj->GetString();
       break;
-    case PDFOBJ_STRING:
+    case CPDF_Object::STRING:
       buf << PDF_EncodeString(pObj->GetString(), pObj->AsString()->IsHex());
       break;
-    case PDFOBJ_NAME: {
+    case CPDF_Object::NAME: {
       CFX_ByteString str = pObj->GetString();
       buf << "/" << PDF_NameEncode(str);
       break;
     }
-    case PDFOBJ_REFERENCE: {
+    case CPDF_Object::REFERENCE: {
       buf << " " << pObj->AsReference()->GetRefObjNum() << " 0 R ";
       break;
     }
-    case PDFOBJ_ARRAY: {
+    case CPDF_Object::ARRAY: {
       const CPDF_Array* p = pObj->AsArray();
       buf << "[";
       for (FX_DWORD i = 0; i < p->GetCount(); i++) {
         CPDF_Object* pElement = p->GetElement(i);
         if (pElement->GetObjNum()) {
           buf << " " << pElement->GetObjNum() << " 0 R";
         } else {
           buf << pElement;
         }
       }
       buf << "]";
       break;
     }
-    case PDFOBJ_DICTIONARY: {
+    case CPDF_Object::DICTIONARY: {
       const CPDF_Dictionary* p = pObj->AsDictionary();
       buf << "<<";
       for (const auto& it : *p) {
         const CFX_ByteString& key = it.first;
         CPDF_Object* pValue = it.second;
         buf << "/" << PDF_NameEncode(key);
         if (pValue && pValue->GetObjNum()) {
           buf << " " << pValue->GetObjNum() << " 0 R ";
         } else {
           buf << pValue;
         }
       }
       buf << ">>";
       break;
     }
-    case PDFOBJ_STREAM: {
+    case CPDF_Object::STREAM: {
       const CPDF_Stream* p = pObj->AsStream();
       buf << p->GetDict() << "stream\r\n";
       CPDF_StreamAcc acc;
       acc.LoadAllData(p, TRUE);
       buf.AppendBlock(acc.GetData(), acc.GetSize());
       buf << "\r\nendstream";
       break;
     }
     default:
       ASSERT(FALSE);
@@ skipping 42 matching lines @@
     CPDF_Object* pFound = SearchNumberNode(pKid, num);
     if (pFound) {
       return pFound;
     }
   }
   return NULL;
 }
 CPDF_Object* CPDF_NumberTree::LookupValue(int num) {
   return SearchNumberNode(m_pRoot, num);
 }