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

core/src/fpdfapi/fpdf_edit/fpdf_edit_create.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_edit/editint.h"
 
 #include <vector>
 
@@ skipping 14 matching lines @@
                                 FX_FILESIZE& offset) {
   int32_t len = 0;
   if (!pObj) {
     if (pFile->AppendString(" null") < 0) {
       return -1;
     }
     offset += 5;
     return 1;
   }
   switch (pObj->GetType()) {
-    case PDFOBJ_NULL:
+    case CPDF_Object::NULLOBJ:
       if (pFile->AppendString(" null") < 0) {
         return -1;
       }
       offset += 5;
       break;
-    case PDFOBJ_BOOLEAN:
-    case PDFOBJ_NUMBER:
+    case CPDF_Object::BOOLEAN:
+    case CPDF_Object::NUMBER:
       if (pFile->AppendString(" ") < 0) {
         return -1;
       }
       if ((len = pFile->AppendString(pObj->GetString())) < 0) {
         return -1;
       }
       offset += len + 1;
       break;
-    case PDFOBJ_STRING: {
+    case CPDF_Object::STRING: {
       CFX_ByteString str = pObj->GetString();
       FX_BOOL bHex = pObj->AsString()->IsHex();
       if ((len = pFile->AppendString(PDF_EncodeString(str, bHex))) < 0) {
         return -1;
       }
       offset += len;
       break;
     }
-    case PDFOBJ_NAME: {
+    case CPDF_Object::NAME: {
       if (pFile->AppendString("/") < 0) {
         return -1;
       }
       CFX_ByteString str = pObj->GetString();
       if ((len = pFile->AppendString(PDF_NameEncode(str))) < 0) {
         return -1;
       }
       offset += len + 1;
       break;
     }
-    case PDFOBJ_REFERENCE: {
+    case CPDF_Object::REFERENCE: {
       if (pFile->AppendString(" ") < 0)
         return -1;
       if ((len = pFile->AppendDWord(pObj->AsReference()->GetRefObjNum())) < 0)
         return -1;
       if (pFile->AppendString(" 0 R ") < 0)
         return -1;
       offset += len + 6;
       break;
     }
-    case PDFOBJ_ARRAY: {
+    case CPDF_Object::ARRAY: {
       if (pFile->AppendString("[") < 0) {
         return -1;
       }
       offset += 1;
       const CPDF_Array* p = pObj->AsArray();
       for (FX_DWORD i = 0; i < p->GetCount(); i++) {
         CPDF_Object* pElement = p->GetElement(i);
         if (pElement->GetObjNum()) {
           if (pFile->AppendString(" ") < 0) {
             return -1;
@@ skipping 10 matching lines @@
             return -1;
           }
         }
       }
       if (pFile->AppendString("]") < 0) {
         return -1;
       }
       offset += 1;
       break;
     }
-    case PDFOBJ_DICTIONARY: {
+    case CPDF_Object::DICTIONARY: {
       if (pFile->AppendString("<<") < 0) {
         return -1;
       }
       offset += 2;
       const CPDF_Dictionary* p = pObj->AsDictionary();
       for (const auto& it : *p) {
         const CFX_ByteString& key = it.first;
         CPDF_Object* pValue = it.second;
         if (pFile->AppendString("/") < 0) {
           return -1;
@@ skipping 18 matching lines @@
             return -1;
           }
         }
       }
       if (pFile->AppendString(">>") < 0) {
         return -1;
       }
       offset += 2;
       break;
     }
-    case PDFOBJ_STREAM: {
+    case CPDF_Object::STREAM: {
       const CPDF_Stream* p = pObj->AsStream();
       if (PDF_CreatorAppendObject(p->GetDict(), pFile, offset) < 0) {
         return -1;
       }
       if (pFile->AppendString("stream\r\n") < 0) {
         return -1;
       }
       offset += 8;
       CPDF_StreamAcc acc;
       acc.LoadAllData(p, TRUE);
@@ skipping 940 matching lines @@
                                      FX_BOOL bEncrypt) {
   int32_t len = 0;
   if (!pObj) {
     if (m_File.AppendString(" null") < 0) {
       return -1;
     }
     m_Offset += 5;
     return 1;
   }
   switch (pObj->GetType()) {
-    case PDFOBJ_NULL:
+    case CPDF_Object::NULLOBJ:
       if (m_File.AppendString(" null") < 0) {
         return -1;
       }
       m_Offset += 5;
       break;
-    case PDFOBJ_BOOLEAN:
-    case PDFOBJ_NUMBER:
+    case CPDF_Object::BOOLEAN:
+    case CPDF_Object::NUMBER:
       if (m_File.AppendString(" ") < 0) {
         return -1;
       }
       if ((len = m_File.AppendString(pObj->GetString())) < 0) {
         return -1;
       }
       m_Offset += len + 1;
       break;
-    case PDFOBJ_STRING: {
+    case CPDF_Object::STRING: {
       CFX_ByteString str = pObj->GetString();
       FX_BOOL bHex = pObj->AsString()->IsHex();
       if (!m_pCryptoHandler || !bEncrypt) {
         CFX_ByteString content = PDF_EncodeString(str, bHex);
         if ((len = m_File.AppendString(content)) < 0) {
           return -1;
         }
         m_Offset += len;
         break;
       }
       CPDF_Encryptor encryptor;
       encryptor.Initialize(m_pCryptoHandler, objnum, (uint8_t*)str.c_str(),
                            str.GetLength());
       CFX_ByteString content = PDF_EncodeString(
           CFX_ByteString((const FX_CHAR*)encryptor.m_pData, encryptor.m_dwSize),
           bHex);
       if ((len = m_File.AppendString(content)) < 0) {
         return -1;
       }
       m_Offset += len;
       break;
     }
-    case PDFOBJ_STREAM: {
+    case CPDF_Object::STREAM: {
       CPDF_FlateEncoder encoder;
       encoder.Initialize(const_cast<CPDF_Stream*>(pObj->AsStream()),
                          m_bCompress);
       CPDF_Encryptor encryptor;
       CPDF_CryptoHandler* pHandler = m_pCryptoHandler;
       encryptor.Initialize(pHandler, objnum, encoder.m_pData, encoder.m_dwSize);
       if ((FX_DWORD)encoder.m_pDict->GetInteger("Length") !=
           encryptor.m_dwSize) {
         encoder.CloneDict();
         encoder.m_pDict->SetAtInteger("Length", encryptor.m_dwSize);
       }
       if (WriteDirectObj(objnum, encoder.m_pDict) < 0) {
         return -1;
       }
       if ((len = m_File.AppendString("stream\r\n")) < 0) {
         return -1;
       }
       m_Offset += len;
       if (m_File.AppendBlock(encryptor.m_pData, encryptor.m_dwSize) < 0) {
         return -1;
       }
       m_Offset += encryptor.m_dwSize;
       if ((len = m_File.AppendString("\r\nendstream")) < 0) {
         return -1;
       }
       m_Offset += len;
       break;
     }
-    case PDFOBJ_NAME: {
+    case CPDF_Object::NAME: {
       if (m_File.AppendString("/") < 0) {
         return -1;
       }
       CFX_ByteString str = pObj->GetString();
       if ((len = m_File.AppendString(PDF_NameEncode(str))) < 0) {
         return -1;
       }
       m_Offset += len + 1;
       break;
     }
-    case PDFOBJ_REFERENCE: {
+    case CPDF_Object::REFERENCE: {
       if (m_File.AppendString(" ") < 0)
         return -1;
       if ((len = m_File.AppendDWord(pObj->AsReference()->GetRefObjNum())) < 0)
         return -1;
       if (m_File.AppendString(" 0 R") < 0)
         return -1;
       m_Offset += len + 5;
       break;
     }
-    case PDFOBJ_ARRAY: {
+    case CPDF_Object::ARRAY: {
       if (m_File.AppendString("[") < 0) {
         return -1;
       }
       m_Offset += 1;
       const CPDF_Array* p = pObj->AsArray();
       for (FX_DWORD i = 0; i < p->GetCount(); i++) {
         CPDF_Object* pElement = p->GetElement(i);
         if (pElement->GetObjNum()) {
           if (m_File.AppendString(" ") < 0) {
             return -1;
@@ skipping 10 matching lines @@
             return -1;
           }
         }
       }
       if (m_File.AppendString("]") < 0) {
         return -1;
       }
       m_Offset += 1;
       break;
     }
-    case PDFOBJ_DICTIONARY: {
+    case CPDF_Object::DICTIONARY: {
       if (!m_pCryptoHandler || pObj == m_pEncryptDict) {
         return PDF_CreatorAppendObject(pObj, &m_File, m_Offset);
       }
       if (m_File.AppendString("<<") < 0) {
         return -1;
       }
       m_Offset += 2;
       const CPDF_Dictionary* p = pObj->AsDictionary();
       bool bSignDict = IsSignatureDict(p);
       for (const auto& it : *p) {
@@ skipping 835 matching lines @@
   m_bNewCrypto = FALSE;
   if (!m_bStandardSecurity) {
     return;
   }
   if (m_pEncryptDict) {
     m_pEncryptDict->Release();
     m_pEncryptDict = NULL;
   }
   m_bStandardSecurity = FALSE;
 }