War on #defines, part 1.

fpdfsdk/src/fpdf_flatten.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 "public/fpdf_flatten.h"
 
 #include <algorithm>
 
@@ skipping 189 matching lines @@
                             pDocument->AddIndirectObject(pNewContents));
 
       CFX_ByteString sStream;
       sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str());
       pNewContents->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE,
                             FALSE);
     }
     return;
   }
 
-  int iType = pContentsObj->GetType();
   CPDF_Array* pContentsArray = NULL;
 
-  switch (iType) {
-    case PDFOBJ_STREAM: {
+  switch (pContentsObj->GetType()) {
+    case CPDF_Object::STREAM: {
       pContentsArray = new CPDF_Array;
       CPDF_Stream* pContents = pContentsObj->AsStream();
       FX_DWORD dwObjNum = pDocument->AddIndirectObject(pContents);
       CPDF_StreamAcc acc;
       acc.LoadAllData(pContents);
       CFX_ByteString sStream = "q\n";
       CFX_ByteString sBody =
           CFX_ByteString((const FX_CHAR*)acc.GetData(), acc.GetSize());
       sStream = sStream + sBody + "\nQ";
       pContents->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE,
                          FALSE);
       pContentsArray->AddReference(pDocument, dwObjNum);
       break;
     }
 
-    case PDFOBJ_ARRAY: {
+    case CPDF_Object::ARRAY: {
       pContentsArray = pContentsObj->AsArray();
       break;
     }
     default:
       break;
   }
 
   if (!pContentsArray)
     return;
 
@@ skipping 273 matching lines @@
     pNewXObject->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE,
                          FALSE);
   }
   pPageDict->RemoveAt("Annots");
 
   ObjectArray.RemoveAll();
   RectArray.RemoveAll();
 
   return FLATTEN_SUCCESS;
 }