Replace FX_NEW with new, remove tests from fpdfsdk

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 "../include/fsdk_define.h"
 #include "../include/fpdf_flatten.h"
 
 typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray;
@@ skipping 22 matching lines @@
                         rect.bottom - rcPage.bottom < -10.000001f)
                         return FALSE;
         }
         
         return TRUE;
 }
 
 
 FX_BOOL GetContentsRect( CPDF_Document * pDoc, CPDF_Dictionary* pDict, CPDF_RectArray * pRectArray )
 {
-        CPDF_Page* pPDFPage = FX_NEW CPDF_Page;
+        CPDF_Page* pPDFPage = new CPDF_Page;
         pPDFPage->Load( pDoc, pDict, FALSE );
         pPDFPage->ParseContent();
 
         FX_POSITION pos = pPDFPage->GetFirstObjectPosition();
         
         while (pos)
         {
                 CPDF_PageObject* pPageObject = pPDFPage->GetNextObject(pos);
                 if (!pPageObject)continue;
                 
@@ skipping 154 matching lines @@
         if (!pContentsObj)
         {
                 pContentsObj = pPage->GetArray("Contents");
         }
         
         if (!pContentsObj)
         {
                 //Create a new contents dictionary
                 if (!key.IsEmpty())
                 {
-                        CPDF_Stream* pNewContents = FX_NEW CPDF_Stream(NULL, 0, FX_NEW CPDF_Dictionary);
-                        if (!pNewContents)return;
+                        CPDF_Stream* pNewContents = new CPDF_Stream(NULL, 0, FX_NEW CPDF_Dictionary);
                         pPage->SetAtReference("Contents", pDocument, pDocument->AddIndirectObject(pNewContents));
-                        
+
                         CFX_ByteString sStream;
                         sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str());
                         pNewContents->SetData((FX_LPCBYTE)sStream, sStream.GetLength(), FALSE, FALSE);
                 }
                 return;
         }
 
         int iType = pContentsObj->GetType();
         CPDF_Array* pContentsArray = NULL;
         
         switch(iType)
         {
         case PDFOBJ_STREAM:
                 {
-                        pContentsArray = FX_NEW CPDF_Array;
+                        pContentsArray = new CPDF_Array;
                         CPDF_Stream* pContents = (CPDF_Stream*)pContentsObj;
                         FX_DWORD dwObjNum = pDocument->AddIndirectObject(pContents);
                         CPDF_StreamAcc acc;
                         acc.LoadAllData(pContents);
                         CFX_ByteString sStream = "q\n";
                         CFX_ByteString sBody = CFX_ByteString((FX_LPCSTR)acc.GetData(), acc.GetSize());
                         sStream = sStream + sBody + "\nQ";
                         pContents->SetData((FX_LPCBYTE)sStream, sStream.GetLength(), FALSE, FALSE);
                         pContentsArray->AddReference(pDocument, dwObjNum);
                         break;
                 }
                 
         case PDFOBJ_ARRAY:
                 {
                         pContentsArray = (CPDF_Array*)pContentsObj;
                         break;
                 }
         default:
                 break;
         }       
         
         if (!pContentsArray)return;
         
         FX_DWORD dwObjNum = pDocument->AddIndirectObject(pContentsArray);
         pPage->SetAtReference("Contents", pDocument, dwObjNum);
         
         if (!key.IsEmpty())
         {
-                CPDF_Stream* pNewContents = FX_NEW CPDF_Stream(NULL, 0, FX_NEW CPDF_Dictionary);
+                CPDF_Stream* pNewContents = new CPDF_Stream(NULL, 0, FX_NEW CPDF_Dictionary);
                 dwObjNum = pDocument->AddIndirectObject(pNewContents);
                 pContentsArray->AddReference(pDocument, dwObjNum);
                 
                 CFX_ByteString sStream;
                 sStream.Format("q 1 0 0 1 0 0 cm /%s Do Q", key.c_str());
                 pNewContents->SetData((FX_LPCBYTE)sStream, sStream.GetLength(), FALSE, FALSE);
         }
 }
  
 CFX_AffineMatrix GetMatrix(CPDF_Rect rcAnnot, CPDF_Rect rcStream, CFX_AffineMatrix matrix)
@@ skipping 95 matching lines @@
         rcMerger.top = rcMerger.top > rcOriginalMB.top? rcOriginalMB.top : rcMerger.top;
         rcMerger.bottom = rcMerger.bottom < rcOriginalMB.bottom? rcOriginalMB.bottom : rcMerger.bottom;
         
         if (pPageDict->KeyExist("ArtBox"))
                 rcOriginalCB = pPageDict->GetRect("ArtBox");
         else
                 rcOriginalCB = rcOriginalMB;
 
         if (!rcOriginalMB.IsEmpty())
         {
-                CPDF_Array* pMediaBox = FX_NEW CPDF_Array();    
-
-                pMediaBox->Add(FX_NEW CPDF_Number(rcOriginalMB.left));
-                pMediaBox->Add(FX_NEW CPDF_Number(rcOriginalMB.bottom));
-                pMediaBox->Add(FX_NEW CPDF_Number(rcOriginalMB.right));
-                pMediaBox->Add(FX_NEW CPDF_Number(rcOriginalMB.top));
-
+                CPDF_Array* pMediaBox = new CPDF_Array();
+                pMediaBox->Add(new CPDF_Number(rcOriginalMB.left));
+                pMediaBox->Add(new CPDF_Number(rcOriginalMB.bottom));
+                pMediaBox->Add(new CPDF_Number(rcOriginalMB.right));
+                pMediaBox->Add(new CPDF_Number(rcOriginalMB.top));
                 pPageDict->SetAt("MediaBox",pMediaBox);
         }
-        
+
         if (!rcOriginalCB.IsEmpty())
         {
-                CPDF_Array* pCropBox = FX_NEW CPDF_Array();
-                pCropBox->Add(FX_NEW CPDF_Number(rcOriginalCB.left));
-                pCropBox->Add(FX_NEW CPDF_Number(rcOriginalCB.bottom));
-                pCropBox->Add(FX_NEW CPDF_Number(rcOriginalCB.right));
-                pCropBox->Add(FX_NEW CPDF_Number(rcOriginalCB.top));
+                CPDF_Array* pCropBox = new CPDF_Array();
+                pCropBox->Add(new CPDF_Number(rcOriginalCB.left));
+                pCropBox->Add(new CPDF_Number(rcOriginalCB.bottom));
+                pCropBox->Add(new CPDF_Number(rcOriginalCB.right));
+                pCropBox->Add(new CPDF_Number(rcOriginalCB.top));
                 pPageDict->SetAt("ArtBox", pCropBox);
         }
 
-        CPDF_Dictionary* pRes = NULL;
-        pRes = pPageDict->GetDict("Resources");
+        CPDF_Dictionary* pRes = pPageDict->GetDict("Resources");
         if (!pRes)
         {
-                pRes = FX_NEW CPDF_Dictionary;
-                pPageDict->SetAt( "Resources", pRes );
+                pRes = new CPDF_Dictionary;
+                pPageDict->SetAt("Resources", pRes);
         }
 
-        CPDF_Stream* pNewXObject = FX_NEW CPDF_Stream(NULL, 0, FX_NEW CPDF_Dictionary);
+        CPDF_Stream* pNewXObject = new CPDF_Stream(NULL, 0, FX_NEW CPDF_Dictionary);
         FX_DWORD dwObjNum = pDocument->AddIndirectObject(pNewXObject);
         CPDF_Dictionary* pPageXObject = pRes->GetDict("XObject");
         if (!pPageXObject)
         {
-                pPageXObject = FX_NEW CPDF_Dictionary;
+                pPageXObject = new CPDF_Dictionary;
                 pRes->SetAt("XObject", pPageXObject);
         }
 
         CFX_ByteString key = "";
         int nStreams = ObjectArray.GetSize();
 
         if (nStreams > 0)
         {
                 for (int iKey = 0; /*iKey < 100*/; iKey++)
                 {
                         char sExtend[5] = {0};
                         FXSYS_itoa(iKey, sExtend, 10);
                         key = CFX_ByteString("FFT") + CFX_ByteString(sExtend);
 
                         if (!pPageXObject->KeyExist(key))
                                 break;
                 }
         }
 
         SetPageContents(key, pPageDict, pDocument);
 
         CPDF_Dictionary* pNewXORes = NULL;
 
         if (!key.IsEmpty())
         {
                 pPageXObject->SetAtReference(key, pDocument, dwObjNum);
                 CPDF_Dictionary* pNewOXbjectDic = pNewXObject->GetDict();
-                pNewXORes = FX_NEW CPDF_Dictionary;
+                pNewXORes = new CPDF_Dictionary;
                 pNewOXbjectDic->SetAt("Resources", pNewXORes);
                 pNewOXbjectDic->SetAtName("Type", "XObject");
                 pNewOXbjectDic->SetAtName("Subtype", "Form");
                 pNewOXbjectDic->SetAtInteger("FormType", 1);
                 pNewOXbjectDic->SetAtName("Name", "FRM");
-                CPDF_Rect rcBBox = pPageDict->GetRect("ArtBox"); 
+                CPDF_Rect rcBBox = pPageDict->GetRect("ArtBox");
                 pNewOXbjectDic->SetAtRect("BBox", rcBBox);
         }
-        
+
         for (int i = 0; i < nStreams; i++)
         {
                 CPDF_Dictionary* pAnnotDic = ObjectArray.GetAt(i);
                 if (!pAnnotDic)continue;
 
                 CPDF_Rect rcAnnot = pAnnotDic->GetRect("Rect");
                 rcAnnot.Normalize();
 
                 CFX_ByteString sAnnotState = pAnnotDic->GetString("AS");
                 CPDF_Dictionary* pAnnotAP = pAnnotDic->GetDict("AP");
@@ skipping 51 matching lines @@
                         if (pObjDic)
                         {
                                 pObjDic->SetAtName("Type", "XObject");
                                 pObjDic->SetAtName("Subtype", "Form");
                         }
                 }
 
                 CPDF_Dictionary* pXObject = pNewXORes->GetDict("XObject");
                 if (!pXObject)
                 {
-                        pXObject = FX_NEW CPDF_Dictionary;
+                        pXObject = new CPDF_Dictionary;
                         pNewXORes->SetAt("XObject", pXObject);
                 }
 
                 CFX_ByteString sFormName;
                 sFormName.Format("F%d", i);
                 FX_DWORD dwObjNum = pDocument->AddIndirectObject(pObj);
                 pXObject->SetAtReference(sFormName, pDocument, dwObjNum);
 
                 CPDF_StreamAcc acc;
                 acc.LoadAllData(pNewXObject);
@@ skipping 18 matching lines @@
 
                 pNewXObject->SetData((FX_LPCBYTE)sStream, sStream.GetLength(), FALSE, FALSE);
         }
         pPageDict->RemoveAt( "Annots" );
 
         ObjectArray.RemoveAll();
         RectArray.RemoveAll();
 
         return FLATTEN_SUCCESS;
 }